[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20120509080752.43489fb0@nehalam.linuxnetplumber.net>
Date: Wed, 9 May 2012 08:07:52 -0700
From: Stephen Hemminger <shemminger@...tta.com>
To: Joe Perches <joe@...ches.com>
Cc: "David S. Miller" <davem@...emloft.net>,
Bart De Schuymer <bart.de.schuymer@...dora.be>,
Pablo Neira Ayuso <pablo@...filter.org>,
Patrick McHardy <kaber@...sh.net>,
netfilter-devel@...r.kernel.org, netfilter@...r.kernel.org,
coreteam@...filter.org, bridge@...ts.linux-foundation.org,
netdev@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH 04/13] bridge: netfilter: Convert compare_ether_addr to
ether_addr_equal
On Tue, 8 May 2012 21:56:48 -0700
Joe Perches <joe@...ches.com> 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 <joe@...ches.com>
> ---
> 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 <shemminger@...tta.com>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists