Skip to contentSkip to conversation

Remove duplicate slow protocol define in bond_3ad.h

PATCH Applied Richard Genoud 3 participants 3 messages May 9, 2009

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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

---
 drivers/net/bonding/bond_3ad.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/bonding/bond_3ad.h +2 -2
index a306230..2c46a15 100644
@@ -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}
Signature · 1 line
1.6.0.4
#1 lore raw
Quoted 27 lines · Sat, May 09, 2009 at 06:59:16PM CEST, [email protected] 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

---
drivers/net/bonding/bond_3ad.h | 4 ++--

1 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/bonding/bond_3ad.h +2 -2
index a306230..2c46a15 100644
@@ -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}
Signature · 1 line
1.6.0.4

Looks good.

Quoted 5 lines

--
To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

maintainer Applied
#2 lore raw

From: Jiri Pirko <[email protected]>
Date: Sat, 9 May 2009 19:12:53 +0200

Quoted 25 lines
Quoted 24 lines · Sat, May 09, 2009 at 06:59:16PM CEST, [email protected] 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

---
drivers/net/bonding/bond_3ad.h | 4 ++--

1 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/bonding/bond_3ad.h +2 -2
index a306230..2c46a15 100644
@@ -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*/
 
Quoted 7 lines
Quoted 3 lines
drivers/net/bonding/bond_3ad.h +0 -0
 #define MULTICAST_LACPDU_ADDR    {0x01, 0x80, 0xC2, 0x00, 0x00, 0x02}
Signature · 1 line
1.6.0.4

Looks good.

Applied to net-next-2.6