Re: [PATCH] Remove duplicate slow protocol define in bond_3ad.h

[David Miller]

From: Jiri Pirko <jpirko@xxxxxxxxxx>
Date: Sat, 9 May 2009 19:12:53 +0200

> Sat, May 09, 2009 at 06:59:16PM CEST, richard.genoud@xxxxxxxxx wrote:
>>ETH_P_SLOW is already defined in include/linux/if_ether.h.
>>There's no need to define BOND_ETH_P_LACPDU in drivers/net/bonding/bond_3ad.h
>>
>>Signed-off-by: Richard Genoud <richard.genoud@xxxxxxxxx>
>>---
>> drivers/net/bonding/bond_3ad.h |    4 ++--
>> 1 files changed, 2 insertions(+), 2 deletions(-)
>>
>>diff --git a/drivers/net/bonding/bond_3ad.h b/drivers/net/bonding/bond_3ad.h
>>index a306230..2c46a15 100644
>>--- a/drivers/net/bonding/bond_3ad.h
>>+++ b/drivers/net/bonding/bond_3ad.h
>>@@ -26,10 +26,10 @@
>> #include <asm/byteorder.h>
>> #include <linux/skbuff.h>
>> #include <linux/netdevice.h>
>>+#include <linux/if_ether.h>
>> 
>> // General definitions
>>-#define BOND_ETH_P_LACPDU       0x8809
>>-#define PKT_TYPE_LACPDU         cpu_to_be16(BOND_ETH_P_LACPDU)
>>+#define PKT_TYPE_LACPDU         cpu_to_be16(ETH_P_SLOW)
>> #define AD_TIMER_INTERVAL       100 /*msec*/
>> 
>> #define MULTICAST_LACPDU_ADDR    {0x01, 0x80, 0xC2, 0x00, 0x00, 0x02}
>>-- 
>>1.6.0.4
> 
> Looks good.
> 
> Signed-off-by: Jiri Pirko <jpirko@xxxxxxxxxx>

Applied to net-next-2.6
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/