From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Miller Subject: Re: [PATCH] Remove duplicate slow protocol define in bond_3ad.h Date: Sat, 09 May 2009 13:18:01 -0700 (PDT) Message-ID: <20090509.131801.250435722.davem@davemloft.net> References: <1241888356-7575-1-git-send-email-richard.genoud@gmail.com> <20090509171250.GA3390@psychotron.englab.brq.redhat.com> Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: richard.genoud@gmail.com, fubar@us.ibm.com, kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org To: jpirko@redhat.com Return-path: Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:43093 "EHLO sunset.davemloft.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754012AbZEIUSF (ORCPT ); Sat, 9 May 2009 16:18:05 -0400 In-Reply-To: <20090509171250.GA3390@psychotron.englab.brq.redhat.com> Sender: netdev-owner@vger.kernel.org List-ID: From: Jiri Pirko 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 >>--- >> 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 >> #include >> #include >>+#include >> >> // 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 Applied to net-next-2.6