diff options
author | Julia Lawall <Julia.Lawall@lip6.fr> | 2013-12-30 13:15:02 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2014-01-03 15:36:59 -0500 |
commit | 90908e1cd14716f1b989b97003007bfcc7be3d13 (patch) | |
tree | 092b39a4c479ed3e73589c9f27fe4b6e01408fe4 /drivers/net/wireless/rtlwifi | |
parent | 3f9a79b5bb0aca128062e33426662b6d9c1b423e (diff) |
rtlwifi: use ether_addr_equal_64bits
Ether_addr_equal_64bits is more efficient than ether_addr_equal, and can be
used when each argument is an array within a structure that contains at
least two bytes of data beyond the array.
The structures involved are:
ieee80211_hdr defined in include/linux/ieee80211.h and
rtl_mac defined in drivers/net/wireless/rtlwifi/wifi.h
This was done using Coccinelle (http://coccinelle.lip6.fr/).
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Acked-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rtlwifi')
-rw-r--r-- | drivers/net/wireless/rtlwifi/base.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/ps.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/rtlwifi/base.c b/drivers/net/wireless/rtlwifi/base.c index fcf9b621918c..d63a12cc5de8 100644 --- a/drivers/net/wireless/rtlwifi/base.c +++ b/drivers/net/wireless/rtlwifi/base.c | |||
@@ -1293,7 +1293,7 @@ void rtl_beacon_statistic(struct ieee80211_hw *hw, struct sk_buff *skb) | |||
1293 | return; | 1293 | return; |
1294 | 1294 | ||
1295 | /* and only beacons from the associated BSSID, please */ | 1295 | /* and only beacons from the associated BSSID, please */ |
1296 | if (!ether_addr_equal(hdr->addr3, rtlpriv->mac80211.bssid)) | 1296 | if (!ether_addr_equal_64bits(hdr->addr3, rtlpriv->mac80211.bssid)) |
1297 | return; | 1297 | return; |
1298 | 1298 | ||
1299 | rtlpriv->link_info.bcn_rx_inperiod++; | 1299 | rtlpriv->link_info.bcn_rx_inperiod++; |
@@ -1781,7 +1781,7 @@ void rtl_recognize_peer(struct ieee80211_hw *hw, u8 *data, unsigned int len) | |||
1781 | return; | 1781 | return; |
1782 | 1782 | ||
1783 | /* and only beacons from the associated BSSID, please */ | 1783 | /* and only beacons from the associated BSSID, please */ |
1784 | if (!ether_addr_equal(hdr->addr3, rtlpriv->mac80211.bssid)) | 1784 | if (!ether_addr_equal_64bits(hdr->addr3, rtlpriv->mac80211.bssid)) |
1785 | return; | 1785 | return; |
1786 | 1786 | ||
1787 | if (rtl_find_221_ie(hw, data, len)) | 1787 | 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 0d81f766fd0f..deedae3c5449 100644 --- a/drivers/net/wireless/rtlwifi/ps.c +++ b/drivers/net/wireless/rtlwifi/ps.c | |||
@@ -478,7 +478,7 @@ void rtl_swlps_beacon(struct ieee80211_hw *hw, void *data, unsigned int len) | |||
478 | return; | 478 | return; |
479 | 479 | ||
480 | /* and only beacons from the associated BSSID, please */ | 480 | /* and only beacons from the associated BSSID, please */ |
481 | if (!ether_addr_equal(hdr->addr3, rtlpriv->mac80211.bssid)) | 481 | if (!ether_addr_equal_64bits(hdr->addr3, rtlpriv->mac80211.bssid)) |
482 | return; | 482 | return; |
483 | 483 | ||
484 | rtlpriv->psc.last_beacon = jiffies; | 484 | rtlpriv->psc.last_beacon = jiffies; |
@@ -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 (!ether_addr_equal(hdr->addr3, rtlpriv->mac80211.bssid)) | 926 | if (!ether_addr_equal_64bits(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 */ |