korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-24 20:54:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

dsa: Convert compare_ether_addr to ether_addr_equal

Browse Source 
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@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Joe Perches 2012-05-08 18:56:57 +00:00 committed by David S. Miller
parent 4c764729ab
commit 8feedbb4a7
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net/dsa/slave.c
View File

@ -66,7 +66,7 @@ static int dsa_slave_open(struct net_device *dev)
if (!(master->flags & IFF_UP)) if (!(master->flags & IFF_UP))
return -ENETDOWN; return -ENETDOWN;
if (compare_ether_addr(dev->dev_addr, master->dev_addr)) { if (!ether_addr_equal(dev->dev_addr, master->dev_addr)) {
err = dev_uc_add(master, dev->dev_addr); err = dev_uc_add(master, dev->dev_addr);
if (err < 0) if (err < 0)
goto out; goto out;
@ -89,7 +89,7 @@ clear_allmulti:
if (dev->flags & IFF_ALLMULTI) if (dev->flags & IFF_ALLMULTI)
dev_set_allmulti(master, -1); dev_set_allmulti(master, -1);
del_unicast: del_unicast:
if (compare_ether_addr(dev->dev_addr, master->dev_addr)) if (!ether_addr_equal(dev->dev_addr, master->dev_addr))
dev_uc_del(master, dev->dev_addr); dev_uc_del(master, dev->dev_addr);
out: out:
return err; return err;
@ -107,7 +107,7 @@ static int dsa_slave_close(struct net_device *dev)
if (dev->flags & IFF_PROMISC) if (dev->flags & IFF_PROMISC)
dev_set_promiscuity(master, -1); dev_set_promiscuity(master, -1);
if (compare_ether_addr(dev->dev_addr, master->dev_addr)) if (!ether_addr_equal(dev->dev_addr, master->dev_addr))
dev_uc_del(master, dev->dev_addr); dev_uc_del(master, dev->dev_addr);
return 0; return 0;
@ -146,13 +146,13 @@ static int dsa_slave_set_mac_address(struct net_device *dev, void *a)
if (!(dev->flags & IFF_UP)) if (!(dev->flags & IFF_UP))
goto out; goto out;
if (compare_ether_addr(addr->sa_data, master->dev_addr)) { if (!ether_addr_equal(addr->sa_data, master->dev_addr)) {
err = dev_uc_add(master, addr->sa_data); err = dev_uc_add(master, addr->sa_data);
if (err < 0) if (err < 0)
return err; return err;
} }
if (compare_ether_addr(dev->dev_addr, master->dev_addr)) if (!ether_addr_equal(dev->dev_addr, master->dev_addr))
dev_uc_del(master, dev->dev_addr); dev_uc_del(master, dev->dev_addr);
out: out: