diff options
author | Joe Perches <joe@perches.com> | 2013-09-01 14:51:23 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-09-03 22:28:04 -0400 |
commit | 7367d0b573d149550d2ae25c402984b98f8f422e (patch) | |
tree | 7979dd25d2883f5ca9835f9d447795f3163a1037 /drivers | |
parent | c9b37458e95629b1d1171457afdcc1bf1eb7881d (diff) |
drivers/net: Convert uses of 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: (and a little typing)
$ 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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 4 | ||||
-rw-r--r-- | drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c | 4 | ||||
-rw-r--r-- | drivers/net/ethernet/tile/tilegx.c | 2 | ||||
-rw-r--r-- | drivers/net/usb/qmi_wwan.c | 2 | ||||
-rw-r--r-- | drivers/net/vxlan.c | 7 | ||||
-rw-r--r-- | drivers/net/wireless/ath/carl9170/rx.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00dev.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/base.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/ps.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8188ee/trx.c | 9 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8723ae/trx.c | 20 |
11 files changed, 30 insertions, 30 deletions
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c index 1f5166ad6bb5..59a62bbfb371 100644 --- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c +++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | |||
@@ -488,8 +488,8 @@ static bool ixgbevf_clean_rx_irq(struct ixgbevf_q_vector *q_vector, | |||
488 | * source pruning. | 488 | * source pruning. |
489 | */ | 489 | */ |
490 | if ((skb->pkt_type & (PACKET_BROADCAST | PACKET_MULTICAST)) && | 490 | if ((skb->pkt_type & (PACKET_BROADCAST | PACKET_MULTICAST)) && |
491 | !(compare_ether_addr(adapter->netdev->dev_addr, | 491 | ether_addr_equal(adapter->netdev->dev_addr, |
492 | eth_hdr(skb)->h_source))) { | 492 | eth_hdr(skb)->h_source)) { |
493 | dev_kfree_skb_irq(skb); | 493 | dev_kfree_skb_irq(skb); |
494 | goto next_desc; | 494 | goto next_desc; |
495 | } | 495 | } |
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c index a9bc651e9ffa..330d9a8774ad 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c | |||
@@ -1652,14 +1652,14 @@ int qlcnic_sriov_set_vf_mac(struct net_device *netdev, int vf, u8 *mac) | |||
1652 | if (!is_valid_ether_addr(mac) || vf >= num_vfs) | 1652 | if (!is_valid_ether_addr(mac) || vf >= num_vfs) |
1653 | return -EINVAL; | 1653 | return -EINVAL; |
1654 | 1654 | ||
1655 | if (!compare_ether_addr(adapter->mac_addr, mac)) { | 1655 | if (ether_addr_equal(adapter->mac_addr, mac)) { |
1656 | netdev_err(netdev, "MAC address is already in use by the PF\n"); | 1656 | netdev_err(netdev, "MAC address is already in use by the PF\n"); |
1657 | return -EINVAL; | 1657 | return -EINVAL; |
1658 | } | 1658 | } |
1659 | 1659 | ||
1660 | for (i = 0; i < num_vfs; i++) { | 1660 | for (i = 0; i < num_vfs; i++) { |
1661 | vf_info = &sriov->vf_info[i]; | 1661 | vf_info = &sriov->vf_info[i]; |
1662 | if (!compare_ether_addr(vf_info->vp->mac, mac)) { | 1662 | if (ether_addr_equal(vf_info->vp->mac, mac)) { |
1663 | netdev_err(netdev, | 1663 | netdev_err(netdev, |
1664 | "MAC address is already in use by VF %d\n", | 1664 | "MAC address is already in use by VF %d\n", |
1665 | i); | 1665 | i); |
diff --git a/drivers/net/ethernet/tile/tilegx.c b/drivers/net/ethernet/tile/tilegx.c index 5d2a719fc688..949076f4e6ae 100644 --- a/drivers/net/ethernet/tile/tilegx.c +++ b/drivers/net/ethernet/tile/tilegx.c | |||
@@ -544,7 +544,7 @@ static inline bool filter_packet(struct net_device *dev, void *buf) | |||
544 | /* Filter out packets that aren't for us. */ | 544 | /* Filter out packets that aren't for us. */ |
545 | if (!(dev->flags & IFF_PROMISC) && | 545 | if (!(dev->flags & IFF_PROMISC) && |
546 | !is_multicast_ether_addr(buf) && | 546 | !is_multicast_ether_addr(buf) && |
547 | compare_ether_addr(dev->dev_addr, buf) != 0) | 547 | !ether_addr_equal(dev->dev_addr, buf)) |
548 | return true; | 548 | return true; |
549 | 549 | ||
550 | return false; | 550 | return false; |
diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c index 606eba2872bd..3a8131582e75 100644 --- a/drivers/net/usb/qmi_wwan.c +++ b/drivers/net/usb/qmi_wwan.c | |||
@@ -323,7 +323,7 @@ next_desc: | |||
323 | /* Never use the same address on both ends of the link, even | 323 | /* Never use the same address on both ends of the link, even |
324 | * if the buggy firmware told us to. | 324 | * if the buggy firmware told us to. |
325 | */ | 325 | */ |
326 | if (!compare_ether_addr(dev->net->dev_addr, default_modem_addr)) | 326 | if (ether_addr_equal(dev->net->dev_addr, default_modem_addr)) |
327 | eth_hw_addr_random(dev->net); | 327 | eth_hw_addr_random(dev->net); |
328 | 328 | ||
329 | /* make MAC addr easily distinguishable from an IP header */ | 329 | /* make MAC addr easily distinguishable from an IP header */ |
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c index 6b560f373fc3..8f6d6c1153ce 100644 --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c | |||
@@ -478,7 +478,7 @@ static struct vxlan_fdb *__vxlan_find_mac(struct vxlan_dev *vxlan, | |||
478 | struct vxlan_fdb *f; | 478 | struct vxlan_fdb *f; |
479 | 479 | ||
480 | hlist_for_each_entry_rcu(f, head, hlist) { | 480 | hlist_for_each_entry_rcu(f, head, hlist) { |
481 | if (compare_ether_addr(mac, f->eth_addr) == 0) | 481 | if (ether_addr_equal(mac, f->eth_addr)) |
482 | return f; | 482 | return f; |
483 | } | 483 | } |
484 | 484 | ||
@@ -1049,8 +1049,7 @@ static void vxlan_rcv(struct vxlan_sock *vs, | |||
1049 | skb->protocol = eth_type_trans(skb, vxlan->dev); | 1049 | skb->protocol = eth_type_trans(skb, vxlan->dev); |
1050 | 1050 | ||
1051 | /* Ignore packet loops (and multicast echo) */ | 1051 | /* Ignore packet loops (and multicast echo) */ |
1052 | if (compare_ether_addr(eth_hdr(skb)->h_source, | 1052 | if (ether_addr_equal(eth_hdr(skb)->h_source, vxlan->dev->dev_addr)) |
1053 | vxlan->dev->dev_addr) == 0) | ||
1054 | goto drop; | 1053 | goto drop; |
1055 | 1054 | ||
1056 | /* Re-examine inner Ethernet packet */ | 1055 | /* Re-examine inner Ethernet packet */ |
@@ -1320,7 +1319,7 @@ static bool route_shortcircuit(struct net_device *dev, struct sk_buff *skb) | |||
1320 | if (n) { | 1319 | if (n) { |
1321 | bool diff; | 1320 | bool diff; |
1322 | 1321 | ||
1323 | diff = compare_ether_addr(eth_hdr(skb)->h_dest, n->ha) != 0; | 1322 | diff = !ether_addr_equal(eth_hdr(skb)->h_dest, n->ha); |
1324 | if (diff) { | 1323 | if (diff) { |
1325 | memcpy(eth_hdr(skb)->h_source, eth_hdr(skb)->h_dest, | 1324 | memcpy(eth_hdr(skb)->h_source, eth_hdr(skb)->h_dest, |
1326 | dev->addr_len); | 1325 | dev->addr_len); |
diff --git a/drivers/net/wireless/ath/carl9170/rx.c b/drivers/net/wireless/ath/carl9170/rx.c index 4684dd989496..e935f61c7fad 100644 --- a/drivers/net/wireless/ath/carl9170/rx.c +++ b/drivers/net/wireless/ath/carl9170/rx.c | |||
@@ -602,8 +602,8 @@ static void carl9170_ba_check(struct ar9170 *ar, void *data, unsigned int len) | |||
602 | 602 | ||
603 | if (bar->start_seq_num == entry_bar->start_seq_num && | 603 | if (bar->start_seq_num == entry_bar->start_seq_num && |
604 | TID_CHECK(bar->control, entry_bar->control) && | 604 | TID_CHECK(bar->control, entry_bar->control) && |
605 | compare_ether_addr(bar->ra, entry_bar->ta) == 0 && | 605 | ether_addr_equal(bar->ra, entry_bar->ta) && |
606 | compare_ether_addr(bar->ta, entry_bar->ra) == 0) { | 606 | ether_addr_equal(bar->ta, entry_bar->ra)) { |
607 | struct ieee80211_tx_info *tx_info; | 607 | struct ieee80211_tx_info *tx_info; |
608 | 608 | ||
609 | tx_info = IEEE80211_SKB_CB(entry_skb); | 609 | tx_info = IEEE80211_SKB_CB(entry_skb); |
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c index b16521e6bf4a..712eea9d398f 100644 --- a/drivers/net/wireless/rt2x00/rt2x00dev.c +++ b/drivers/net/wireless/rt2x00/rt2x00dev.c | |||
@@ -566,10 +566,10 @@ static void rt2x00lib_rxdone_check_ba(struct rt2x00_dev *rt2x00dev, | |||
566 | 566 | ||
567 | #undef TID_CHECK | 567 | #undef TID_CHECK |
568 | 568 | ||
569 | if (compare_ether_addr(ba->ra, entry->ta)) | 569 | if (!ether_addr_equal(ba->ra, entry->ta)) |
570 | continue; | 570 | continue; |
571 | 571 | ||
572 | if (compare_ether_addr(ba->ta, entry->ra)) | 572 | if (!ether_addr_equal(ba->ta, entry->ra)) |
573 | continue; | 573 | continue; |
574 | 574 | ||
575 | /* Mark BAR since we received the according BA */ | 575 | /* Mark BAR since we received the according BA */ |
diff --git a/drivers/net/wireless/rtlwifi/base.c b/drivers/net/wireless/rtlwifi/base.c index 7651f5acc14b..8bb4a9a01a18 100644 --- a/drivers/net/wireless/rtlwifi/base.c +++ b/drivers/net/wireless/rtlwifi/base.c | |||
@@ -1304,7 +1304,7 @@ void rtl_beacon_statistic(struct ieee80211_hw *hw, struct sk_buff *skb) | |||
1304 | return; | 1304 | return; |
1305 | 1305 | ||
1306 | /* and only beacons from the associated BSSID, please */ | 1306 | /* and only beacons from the associated BSSID, please */ |
1307 | if (compare_ether_addr(hdr->addr3, rtlpriv->mac80211.bssid)) | 1307 | if (!ether_addr_equal(hdr->addr3, rtlpriv->mac80211.bssid)) |
1308 | return; | 1308 | return; |
1309 | 1309 | ||
1310 | rtlpriv->link_info.bcn_rx_inperiod++; | 1310 | rtlpriv->link_info.bcn_rx_inperiod++; |
diff --git a/drivers/net/wireless/rtlwifi/ps.c b/drivers/net/wireless/rtlwifi/ps.c index f646b7585d9b..0d81f766fd0f 100644 --- a/drivers/net/wireless/rtlwifi/ps.c +++ b/drivers/net/wireless/rtlwifi/ps.c | |||
@@ -923,7 +923,7 @@ void rtl_p2p_info(struct ieee80211_hw *hw, void *data, unsigned int len) | |||
923 | return; | 923 | return; |
924 | 924 | ||
925 | /* and only beacons from the associated BSSID, please */ | 925 | /* and only beacons from the associated BSSID, please */ |
926 | if (compare_ether_addr(hdr->addr3, rtlpriv->mac80211.bssid)) | 926 | if (!ether_addr_equal(hdr->addr3, rtlpriv->mac80211.bssid)) |
927 | return; | 927 | return; |
928 | 928 | ||
929 | /* check if this really is a beacon */ | 929 | /* check if this really is a beacon */ |
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/trx.c b/drivers/net/wireless/rtlwifi/rtl8188ee/trx.c index a8871d66d56a..68685a898257 100644 --- a/drivers/net/wireless/rtlwifi/rtl8188ee/trx.c +++ b/drivers/net/wireless/rtlwifi/rtl8188ee/trx.c | |||
@@ -305,13 +305,14 @@ static void _rtl88ee_translate_rx_signal_stuff(struct ieee80211_hw *hw, | |||
305 | psaddr = ieee80211_get_SA(hdr); | 305 | psaddr = ieee80211_get_SA(hdr); |
306 | memcpy(pstatus->psaddr, psaddr, ETH_ALEN); | 306 | memcpy(pstatus->psaddr, psaddr, ETH_ALEN); |
307 | 307 | ||
308 | addr = (!compare_ether_addr(mac->bssid, (ufc & IEEE80211_FCTL_TODS) ? | 308 | addr = ether_addr_equal(mac->bssid, |
309 | hdr->addr1 : (ufc & IEEE80211_FCTL_FROMDS) ? | 309 | (ufc & IEEE80211_FCTL_TODS) ? hdr->addr1 : |
310 | hdr->addr2 : hdr->addr3)); | 310 | (ufc & IEEE80211_FCTL_FROMDS) ? hdr->addr2 : |
311 | hdr->addr3); | ||
311 | match_bssid = ((IEEE80211_FTYPE_CTL != type) && (!pstatus->hwerror) && | 312 | match_bssid = ((IEEE80211_FTYPE_CTL != type) && (!pstatus->hwerror) && |
312 | (!pstatus->crc) && (!pstatus->icv)) && addr; | 313 | (!pstatus->crc) && (!pstatus->icv)) && addr; |
313 | 314 | ||
314 | addr = (!compare_ether_addr(praddr, rtlefuse->dev_addr)); | 315 | addr = ether_addr_equal(praddr, rtlefuse->dev_addr); |
315 | packet_toself = match_bssid && addr; | 316 | packet_toself = match_bssid && addr; |
316 | 317 | ||
317 | if (ieee80211_is_beacon(fc)) | 318 | if (ieee80211_is_beacon(fc)) |
diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/trx.c b/drivers/net/wireless/rtlwifi/rtl8723ae/trx.c index c72758d8f4ed..bcd82a1020a5 100644 --- a/drivers/net/wireless/rtlwifi/rtl8723ae/trx.c +++ b/drivers/net/wireless/rtlwifi/rtl8723ae/trx.c | |||
@@ -255,16 +255,16 @@ static void _rtl8723ae_translate_rx_signal_stuff(struct ieee80211_hw *hw, | |||
255 | type = WLAN_FC_GET_TYPE(fc); | 255 | type = WLAN_FC_GET_TYPE(fc); |
256 | praddr = hdr->addr1; | 256 | praddr = hdr->addr1; |
257 | 257 | ||
258 | packet_matchbssid = ((IEEE80211_FTYPE_CTL != type) && | 258 | packet_matchbssid = |
259 | (!compare_ether_addr(mac->bssid, | 259 | ((IEEE80211_FTYPE_CTL != type) && |
260 | (le16_to_cpu(fc) & IEEE80211_FCTL_TODS) ? | 260 | ether_addr_equal(mac->bssid, |
261 | hdr->addr1 : (le16_to_cpu(fc) & | 261 | (le16_to_cpu(fc) & IEEE80211_FCTL_TODS) ? hdr->addr1 : |
262 | IEEE80211_FCTL_FROMDS) ? | 262 | (le16_to_cpu(fc) & IEEE80211_FCTL_FROMDS) ? hdr->addr2 : |
263 | hdr->addr2 : hdr->addr3)) && (!pstatus->hwerror) && | 263 | hdr->addr3) && |
264 | (!pstatus->crc) && (!pstatus->icv)); | 264 | (!pstatus->hwerror) && (!pstatus->crc) && (!pstatus->icv)); |
265 | 265 | ||
266 | packet_toself = packet_matchbssid && | 266 | packet_toself = (packet_matchbssid && |
267 | (!compare_ether_addr(praddr, rtlefuse->dev_addr)); | 267 | ether_addr_equal(praddr, rtlefuse->dev_addr)); |
268 | 268 | ||
269 | if (ieee80211_is_beacon(fc)) | 269 | if (ieee80211_is_beacon(fc)) |
270 | packet_beacon = true; | 270 | packet_beacon = true; |