diff options
author | Richard Genoud <richard.genoud@gmail.com> | 2009-05-09 02:59:16 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-05-09 16:15:49 -0400 |
commit | ed9b58bc443a1210b5be1ded6421b17e015bf985 (patch) | |
tree | f8590cddfab5f4dcd24c39c4e0bb1bebe28a5073 /drivers | |
parent | ab9c73ccb52f40576ce017528d542eda3c6ae766 (diff) |
Remove duplicate slow protocol define in bond_3ad.h
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@gmail.com>
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r-- | 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 a306230381c8..2c46a154f2c6 100644 --- a/drivers/net/bonding/bond_3ad.h +++ b/drivers/net/bonding/bond_3ad.h | |||
@@ -26,10 +26,10 @@ | |||
26 | #include <asm/byteorder.h> | 26 | #include <asm/byteorder.h> |
27 | #include <linux/skbuff.h> | 27 | #include <linux/skbuff.h> |
28 | #include <linux/netdevice.h> | 28 | #include <linux/netdevice.h> |
29 | #include <linux/if_ether.h> | ||
29 | 30 | ||
30 | // General definitions | 31 | // General definitions |
31 | #define BOND_ETH_P_LACPDU 0x8809 | 32 | #define PKT_TYPE_LACPDU cpu_to_be16(ETH_P_SLOW) |
32 | #define PKT_TYPE_LACPDU cpu_to_be16(BOND_ETH_P_LACPDU) | ||
33 | #define AD_TIMER_INTERVAL 100 /*msec*/ | 33 | #define AD_TIMER_INTERVAL 100 /*msec*/ |
34 | 34 | ||
35 | #define MULTICAST_LACPDU_ADDR {0x01, 0x80, 0xC2, 0x00, 0x00, 0x02} | 35 | #define MULTICAST_LACPDU_ADDR {0x01, 0x80, 0xC2, 0x00, 0x00, 0x02} |