Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 171fe5ef authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files

bridge: netfilter: Convert compare_ether_addr to ether_addr_equal 



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: default avatarJoe Perches <joe@perches.com>
Acked-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 53a2b3a1

net/bridge/netfilter/ebt_stp.c

+2 −2
Original line number Diff line number Diff line
@@ -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;