From: David Miller <davem@davemloft.net>
To: jpirko@redhat.com
Cc: richard.genoud@gmail.com, fubar@us.ibm.com,
kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org,
netdev@vger.kernel.org
Subject: Re: [PATCH] Remove duplicate slow protocol define in bond_3ad.h
Date: Sat, 09 May 2009 13:18:01 -0700 (PDT) [thread overview]
Message-ID: <20090509.131801.250435722.davem@davemloft.net> (raw)
In-Reply-To: <20090509171250.GA3390@psychotron.englab.brq.redhat.com>
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
prev parent reply other threads:[~2009-05-09 20:18 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090509.131801.250435722.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=fubar@us.ibm.com \
--cc=jpirko@redhat.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=richard.genoud@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox