diff options
author | Joe Perches <joe@perches.com> | 2012-05-09 13:17:46 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-05-10 23:33:01 -0400 |
commit | 2e42e4747ea72943c21551d8a206b51a9893b1e0 (patch) | |
tree | a92473c485911b51e1d960c9c8fa34dfc9be0a46 /drivers/net/wireless/rtlwifi | |
parent | 39f1d94d300a58eb3e9b851d077cada4e2fa9d46 (diff) |
drivers/net: 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: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/rtlwifi')
-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/rtl8192ce/trx.c | 10 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192cu/mac.c | 10 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192de/trx.c | 11 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192se/trx.c | 11 |
6 files changed, 24 insertions, 22 deletions
diff --git a/drivers/net/wireless/rtlwifi/base.c b/drivers/net/wireless/rtlwifi/base.c index e54488db0e10..f4c852c6749b 100644 --- a/drivers/net/wireless/rtlwifi/base.c +++ b/drivers/net/wireless/rtlwifi/base.c | |||
@@ -1460,7 +1460,7 @@ void rtl_recognize_peer(struct ieee80211_hw *hw, u8 *data, unsigned int len) | |||
1460 | return; | 1460 | return; |
1461 | 1461 | ||
1462 | /* and only beacons from the associated BSSID, please */ | 1462 | /* and only beacons from the associated BSSID, please */ |
1463 | if (compare_ether_addr(hdr->addr3, rtlpriv->mac80211.bssid)) | 1463 | if (!ether_addr_equal(hdr->addr3, rtlpriv->mac80211.bssid)) |
1464 | return; | 1464 | return; |
1465 | 1465 | ||
1466 | if (rtl_find_221_ie(hw, data, len)) | 1466 | if (rtl_find_221_ie(hw, data, len)) |
diff --git a/drivers/net/wireless/rtlwifi/ps.c b/drivers/net/wireless/rtlwifi/ps.c index 5b9c3b5e8c92..5ae26647f340 100644 --- a/drivers/net/wireless/rtlwifi/ps.c +++ b/drivers/net/wireless/rtlwifi/ps.c | |||
@@ -480,7 +480,7 @@ void rtl_swlps_beacon(struct ieee80211_hw *hw, void *data, unsigned int len) | |||
480 | return; | 480 | return; |
481 | 481 | ||
482 | /* and only beacons from the associated BSSID, please */ | 482 | /* and only beacons from the associated BSSID, please */ |
483 | if (compare_ether_addr(hdr->addr3, rtlpriv->mac80211.bssid)) | 483 | if (!ether_addr_equal(hdr->addr3, rtlpriv->mac80211.bssid)) |
484 | return; | 484 | return; |
485 | 485 | ||
486 | rtlpriv->psc.last_beacon = jiffies; | 486 | rtlpriv->psc.last_beacon = jiffies; |
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c index 37b13636a778..3af874e69595 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c +++ b/drivers/net/wireless/rtlwifi/rtl8192ce/trx.c | |||
@@ -508,14 +508,14 @@ static void _rtl92ce_translate_rx_signal_stuff(struct ieee80211_hw *hw, | |||
508 | 508 | ||
509 | packet_matchbssid = | 509 | packet_matchbssid = |
510 | ((IEEE80211_FTYPE_CTL != type) && | 510 | ((IEEE80211_FTYPE_CTL != type) && |
511 | (!compare_ether_addr(mac->bssid, | 511 | ether_addr_equal(mac->bssid, |
512 | (c_fc & IEEE80211_FCTL_TODS) ? | 512 | (c_fc & IEEE80211_FCTL_TODS) ? hdr->addr1 : |
513 | hdr->addr1 : (c_fc & IEEE80211_FCTL_FROMDS) ? | 513 | (c_fc & IEEE80211_FCTL_FROMDS) ? hdr->addr2 : |
514 | hdr->addr2 : hdr->addr3)) && | 514 | hdr->addr3) && |
515 | (!pstats->hwerror) && (!pstats->crc) && (!pstats->icv)); | 515 | (!pstats->hwerror) && (!pstats->crc) && (!pstats->icv)); |
516 | 516 | ||
517 | packet_toself = packet_matchbssid && | 517 | packet_toself = packet_matchbssid && |
518 | (!compare_ether_addr(praddr, rtlefuse->dev_addr)); | 518 | ether_addr_equal(praddr, rtlefuse->dev_addr); |
519 | 519 | ||
520 | if (ieee80211_is_beacon(fc)) | 520 | if (ieee80211_is_beacon(fc)) |
521 | packet_beacon = true; | 521 | packet_beacon = true; |
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c b/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c index 025bdc2eba44..7e91c76582ec 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c +++ b/drivers/net/wireless/rtlwifi/rtl8192cu/mac.c | |||
@@ -1099,14 +1099,14 @@ void rtl92c_translate_rx_signal_stuff(struct ieee80211_hw *hw, | |||
1099 | praddr = hdr->addr1; | 1099 | praddr = hdr->addr1; |
1100 | packet_matchbssid = | 1100 | packet_matchbssid = |
1101 | ((IEEE80211_FTYPE_CTL != type) && | 1101 | ((IEEE80211_FTYPE_CTL != type) && |
1102 | (!compare_ether_addr(mac->bssid, | 1102 | ether_addr_equal(mac->bssid, |
1103 | (cpu_fc & IEEE80211_FCTL_TODS) ? | 1103 | (cpu_fc & IEEE80211_FCTL_TODS) ? hdr->addr1 : |
1104 | hdr->addr1 : (cpu_fc & IEEE80211_FCTL_FROMDS) ? | 1104 | (cpu_fc & IEEE80211_FCTL_FROMDS) ? hdr->addr2 : |
1105 | hdr->addr2 : hdr->addr3)) && | 1105 | hdr->addr3) && |
1106 | (!pstats->hwerror) && (!pstats->crc) && (!pstats->icv)); | 1106 | (!pstats->hwerror) && (!pstats->crc) && (!pstats->icv)); |
1107 | 1107 | ||
1108 | packet_toself = packet_matchbssid && | 1108 | packet_toself = packet_matchbssid && |
1109 | (!compare_ether_addr(praddr, rtlefuse->dev_addr)); | 1109 | ether_addr_equal(praddr, rtlefuse->dev_addr); |
1110 | if (ieee80211_is_beacon(fc)) | 1110 | if (ieee80211_is_beacon(fc)) |
1111 | packet_beacon = true; | 1111 | packet_beacon = true; |
1112 | _rtl92c_query_rxphystatus(hw, pstats, pdesc, p_drvinfo, | 1112 | _rtl92c_query_rxphystatus(hw, pstats, pdesc, p_drvinfo, |
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/trx.c b/drivers/net/wireless/rtlwifi/rtl8192de/trx.c index a7f6126e2f86..1666ef7fd87b 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192de/trx.c +++ b/drivers/net/wireless/rtlwifi/rtl8192de/trx.c | |||
@@ -466,12 +466,13 @@ static void _rtl92de_translate_rx_signal_stuff(struct ieee80211_hw *hw, | |||
466 | type = WLAN_FC_GET_TYPE(fc); | 466 | type = WLAN_FC_GET_TYPE(fc); |
467 | praddr = hdr->addr1; | 467 | praddr = hdr->addr1; |
468 | packet_matchbssid = ((IEEE80211_FTYPE_CTL != type) && | 468 | packet_matchbssid = ((IEEE80211_FTYPE_CTL != type) && |
469 | (!compare_ether_addr(mac->bssid, (cfc & IEEE80211_FCTL_TODS) ? | 469 | ether_addr_equal(mac->bssid, |
470 | hdr->addr1 : (cfc & IEEE80211_FCTL_FROMDS) ? | 470 | (cfc & IEEE80211_FCTL_TODS) ? hdr->addr1 : |
471 | hdr->addr2 : hdr->addr3)) && (!pstats->hwerror) && | 471 | (cfc & IEEE80211_FCTL_FROMDS) ? hdr->addr2 : |
472 | (!pstats->crc) && (!pstats->icv)); | 472 | hdr->addr3) && |
473 | (!pstats->hwerror) && (!pstats->crc) && (!pstats->icv)); | ||
473 | packet_toself = packet_matchbssid && | 474 | packet_toself = packet_matchbssid && |
474 | (!compare_ether_addr(praddr, rtlefuse->dev_addr)); | 475 | ether_addr_equal(praddr, rtlefuse->dev_addr); |
475 | if (ieee80211_is_beacon(fc)) | 476 | if (ieee80211_is_beacon(fc)) |
476 | packet_beacon = true; | 477 | packet_beacon = true; |
477 | _rtl92de_query_rxphystatus(hw, pstats, pdesc, p_drvinfo, | 478 | _rtl92de_query_rxphystatus(hw, pstats, pdesc, p_drvinfo, |
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/trx.c b/drivers/net/wireless/rtlwifi/rtl8192se/trx.c index 2fd3d13b7ced..812b5858f14a 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192se/trx.c +++ b/drivers/net/wireless/rtlwifi/rtl8192se/trx.c | |||
@@ -492,13 +492,14 @@ static void _rtl92se_translate_rx_signal_stuff(struct ieee80211_hw *hw, | |||
492 | praddr = hdr->addr1; | 492 | praddr = hdr->addr1; |
493 | 493 | ||
494 | packet_matchbssid = ((IEEE80211_FTYPE_CTL != type) && | 494 | packet_matchbssid = ((IEEE80211_FTYPE_CTL != type) && |
495 | (!compare_ether_addr(mac->bssid, (cfc & IEEE80211_FCTL_TODS) ? | 495 | ether_addr_equal(mac->bssid, |
496 | hdr->addr1 : (cfc & IEEE80211_FCTL_FROMDS) ? | 496 | (cfc & IEEE80211_FCTL_TODS) ? hdr->addr1 : |
497 | hdr->addr2 : hdr->addr3)) && (!pstats->hwerror) && | 497 | (cfc & IEEE80211_FCTL_FROMDS) ? hdr->addr2 : |
498 | (!pstats->crc) && (!pstats->icv)); | 498 | hdr->addr3) && |
499 | (!pstats->hwerror) && (!pstats->crc) && (!pstats->icv)); | ||
499 | 500 | ||
500 | packet_toself = packet_matchbssid && | 501 | packet_toself = packet_matchbssid && |
501 | (!compare_ether_addr(praddr, rtlefuse->dev_addr)); | 502 | ether_addr_equal(praddr, rtlefuse->dev_addr); |
502 | 503 | ||
503 | if (ieee80211_is_beacon(fc)) | 504 | if (ieee80211_is_beacon(fc)) |
504 | packet_beacon = true; | 505 | packet_beacon = true; |