* [PATCH] Remove duplicate slow protocol define in bond_3ad.h
@ 2009-05-09 16:59 Richard Genoud
2009-05-09 17:12 ` Jiri Pirko
0 siblings, 1 reply; 3+ messages in thread
From: Richard Genoud @ 2009-05-09 16:59 UTC (permalink / raw)
To: Jay Vosburgh; +Cc: kernel-janitors, linux-kernel, netdev, Richard Genoud
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>
---
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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] Remove duplicate slow protocol define in bond_3ad.h
2009-05-09 16:59 [PATCH] Remove duplicate slow protocol define in bond_3ad.h Richard Genoud
@ 2009-05-09 17:12 ` Jiri Pirko
2009-05-09 20:18 ` David Miller
0 siblings, 1 reply; 3+ messages in thread
From: Jiri Pirko @ 2009-05-09 17:12 UTC (permalink / raw)
To: Richard Genoud; +Cc: Jay Vosburgh, kernel-janitors, linux-kernel, netdev
Sat, May 09, 2009 at 06:59:16PM CEST, richard.genoud@gmail.com 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@gmail.com>
>---
> 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@redhat.com>
>
>--
>To unsubscribe from this list: send the line "unsubscribe netdev" in
>the body of a message to majordomo@vger.kernel.org
>More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] Remove duplicate slow protocol define in bond_3ad.h
2009-05-09 17:12 ` Jiri Pirko
@ 2009-05-09 20:18 ` David Miller
0 siblings, 0 replies; 3+ messages in thread
From: David Miller @ 2009-05-09 20:18 UTC (permalink / raw)
To: jpirko; +Cc: richard.genoud, fubar, kernel-janitors, linux-kernel, netdev
From: Jiri Pirko <jpirko@redhat.com>
Date: Sat, 9 May 2009 19:12:53 +0200
> Sat, May 09, 2009 at 06:59:16PM CEST, richard.genoud@gmail.com 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@gmail.com>
>>---
>> 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@redhat.com>
Applied to net-next-2.6
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-05-09 20:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-05-09 16:59 [PATCH] Remove duplicate slow protocol define in bond_3ad.h Richard Genoud
2009-05-09 17:12 ` Jiri Pirko
2009-05-09 20:18 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox