Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759419Ab2EIPH6 (ORCPT ); Wed, 9 May 2012 11:07:58 -0400 Received: from mail.vyatta.com ([76.74.103.46]:37374 "EHLO mail.vyatta.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755445Ab2EIPHz (ORCPT ); Wed, 9 May 2012 11:07:55 -0400 Date: Wed, 9 May 2012 08:07:52 -0700 From: Stephen Hemminger 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 Subject: Re: [PATCH 04/13] bridge: netfilter: Convert compare_ether_addr to ether_addr_equal Message-ID: <20120509080752.43489fb0@nehalam.linuxnetplumber.net> In-Reply-To: <5a91d328db3393320170723cdfc9395ad59182c6.1336538938.git.joe@perches.com> References: <5a91d328db3393320170723cdfc9395ad59182c6.1336538938.git.joe@perches.com> Organization: Vyatta X-Mailer: Claws Mail 3.8.0 (GTK+ 2.24.10; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2060 Lines: 81 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/