From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Wed, 9 May 2012 08:07:52 -0700 From: Stephen Hemminger Message-ID: <20120509080752.43489fb0@nehalam.linuxnetplumber.net> In-Reply-To: <5a91d328db3393320170723cdfc9395ad59182c6.1336538938.git.joe@perches.com> References: <5a91d328db3393320170723cdfc9395ad59182c6.1336538938.git.joe@perches.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Bridge] [PATCH 04/13] bridge: netfilter: Convert compare_ether_addr to ether_addr_equal List-Id: Linux Ethernet Bridging List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Joe Perches Cc: coreteam@netfilter.org, netdev@vger.kernel.org, bridge@lists.linux-foundation.org, linux-kernel@vger.kernel.org, netfilter@vger.kernel.org, Bart De Schuymer , netfilter-devel@vger.kernel.org, "David S. Miller" , Pablo Neira Ayuso On Tue, 8 May 2012 21:56:48 -0700 Joe Perches wrote: > Use the new bool function ether_addr_equal to add > some clarity and reduce the likelihood for misuse > of compare_ether_addr for sorting. > > Done via cocci script: > > $ cat compare_ether_addr.cocci > @@ > expression a,b; > @@ > - !compare_ether_addr(a, b) > + ether_addr_equal(a, b) > > @@ > expression a,b; > @@ > - compare_ether_addr(a, b) > + !ether_addr_equal(a, b) > > @@ > expression a,b; > @@ > - !ether_addr_equal(a, b) == 0 > + ether_addr_equal(a, b) > > @@ > expression a,b; > @@ > - !ether_addr_equal(a, b) != 0 > + !ether_addr_equal(a, b) > > @@ > expression a,b; > @@ > - ether_addr_equal(a, b) == 0 > + !ether_addr_equal(a, b) > > @@ > expression a,b; > @@ > - ether_addr_equal(a, b) != 0 > + ether_addr_equal(a, b) > > @@ > expression a,b; > @@ > - !!ether_addr_equal(a, b) > + ether_addr_equal(a, b) > > Signed-off-by: Joe Perches > --- > net/bridge/netfilter/ebt_stp.c | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/net/bridge/netfilter/ebt_stp.c b/net/bridge/netfilter/ebt_stp.c > index 5b33a2e..071d872 100644 > --- a/net/bridge/netfilter/ebt_stp.c > +++ b/net/bridge/netfilter/ebt_stp.c > @@ -164,8 +164,8 @@ static int ebt_stp_mt_check(const struct xt_mtchk_param *par) > !(info->bitmask & EBT_STP_MASK)) > return -EINVAL; > /* Make sure the match only receives stp frames */ > - if (compare_ether_addr(e->destmac, bridge_ula) || > - compare_ether_addr(e->destmsk, msk) || !(e->bitmask & EBT_DESTMAC)) > + if (!ether_addr_equal(e->destmac, bridge_ula) || > + !ether_addr_equal(e->destmsk, msk) || !(e->bitmask & EBT_DESTMAC)) > return -EINVAL; > > return 0; All look good. Acked-by: Stephen Hemminger From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Hemminger Subject: Re: [PATCH 04/13] bridge: netfilter: Convert compare_ether_addr to ether_addr_equal Date: Wed, 9 May 2012 08:07:52 -0700 Message-ID: <20120509080752.43489fb0@nehalam.linuxnetplumber.net> References: <5a91d328db3393320170723cdfc9395ad59182c6.1336538938.git.joe@perches.com> Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <5a91d328db3393320170723cdfc9395ad59182c6.1336538938.git.joe@perches.com> Sender: netfilter-devel-owner@vger.kernel.org List-ID: Content-Type: text/plain; charset="us-ascii" To: Joe Perches Cc: "David S. Miller" , Bart De Schuymer , Pablo Neira Ayuso , Patrick McHardy , netfilter-devel@vger.kernel.org, netfilter@vger.kernel.org, coreteam@netfilter.org, bridge@lists.linux-foundation.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org On Tue, 8 May 2012 21:56:48 -0700 Joe Perches wrote: > Use the new bool function ether_addr_equal to add > some clarity and reduce the likelihood for misuse > of compare_ether_addr for sorting. > > Done via cocci script: > > $ cat compare_ether_addr.cocci > @@ > expression a,b; > @@ > - !compare_ether_addr(a, b) > + ether_addr_equal(a, b) > > @@ > expression a,b; > @@ > - compare_ether_addr(a, b) > + !ether_addr_equal(a, b) > > @@ > expression a,b; > @@ > - !ether_addr_equal(a, b) == 0 > + ether_addr_equal(a, b) > > @@ > expression a,b; > @@ > - !ether_addr_equal(a, b) != 0 > + !ether_addr_equal(a, b) > > @@ > expression a,b; > @@ > - ether_addr_equal(a, b) == 0 > + !ether_addr_equal(a, b) > > @@ > expression a,b; > @@ > - ether_addr_equal(a, b) != 0 > + ether_addr_equal(a, b) > > @@ > expression a,b; > @@ > - !!ether_addr_equal(a, b) > + ether_addr_equal(a, b) > > Signed-off-by: Joe Perches > --- > net/bridge/netfilter/ebt_stp.c | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/net/bridge/netfilter/ebt_stp.c b/net/bridge/netfilter/ebt_stp.c > index 5b33a2e..071d872 100644 > --- a/net/bridge/netfilter/ebt_stp.c > +++ b/net/bridge/netfilter/ebt_stp.c > @@ -164,8 +164,8 @@ static int ebt_stp_mt_check(const struct xt_mtchk_param *par) > !(info->bitmask & EBT_STP_MASK)) > return -EINVAL; > /* Make sure the match only receives stp frames */ > - if (compare_ether_addr(e->destmac, bridge_ula) || > - compare_ether_addr(e->destmsk, msk) || !(e->bitmask & EBT_DESTMAC)) > + if (!ether_addr_equal(e->destmac, bridge_ula) || > + !ether_addr_equal(e->destmsk, msk) || !(e->bitmask & EBT_DESTMAC)) > return -EINVAL; > > return 0; All look good. Acked-by: Stephen Hemminger