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

Commit 90908e1c authored by Julia Lawall's avatar Julia Lawall Committed by John W. Linville
Browse files

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: default avatarJulia Lawall <Julia.Lawall@lip6.fr>
Acked-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 3f9a79b5

drivers/net/wireless/rtlwifi/base.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1293,7 +1293,7 @@ void rtl_beacon_statistic(struct ieee80211_hw *hw, struct sk_buff *skb) 
		return;

		return;





	/* and only beacons from the associated BSSID, please */

	/* and only beacons from the associated BSSID, please */

	if (!ether_addr_equal(hdr->addr3, rtlpriv->mac80211.bssid))

	if (!ether_addr_equal_64bits(hdr->addr3, rtlpriv->mac80211.bssid))

		return;

		return;





	rtlpriv->link_info.bcn_rx_inperiod++;

	rtlpriv->link_info.bcn_rx_inperiod++;
@@ -1781,7 +1781,7 @@ void rtl_recognize_peer(struct ieee80211_hw *hw, u8 *data, unsigned int len) 
		return;

		return;





	/* and only beacons from the associated BSSID, please */

	/* and only beacons from the associated BSSID, please */

	if (!ether_addr_equal(hdr->addr3, rtlpriv->mac80211.bssid))

	if (!ether_addr_equal_64bits(hdr->addr3, rtlpriv->mac80211.bssid))

		return;

		return;





	if (rtl_find_221_ie(hw, data, len))

	if (rtl_find_221_ie(hw, data, len))

drivers/net/wireless/rtlwifi/ps.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -478,7 +478,7 @@ void rtl_swlps_beacon(struct ieee80211_hw *hw, void *data, unsigned int len) 
		return;

		return;





	/* and only beacons from the associated BSSID, please */

	/* and only beacons from the associated BSSID, please */

	if (!ether_addr_equal(hdr->addr3, rtlpriv->mac80211.bssid))

	if (!ether_addr_equal_64bits(hdr->addr3, rtlpriv->mac80211.bssid))

		return;

		return;





	rtlpriv->psc.last_beacon = jiffies;

	rtlpriv->psc.last_beacon = jiffies;
@@ -923,7 +923,7 @@ void rtl_p2p_info(struct ieee80211_hw *hw, void *data, unsigned int len) 
		return;

		return;





	/* and only beacons from the associated BSSID, please */

	/* and only beacons from the associated BSSID, please */

	if (!ether_addr_equal(hdr->addr3, rtlpriv->mac80211.bssid))

	if (!ether_addr_equal_64bits(hdr->addr3, rtlpriv->mac80211.bssid))

		return;

		return;





	/* check if this really is a beacon */

	/* check if this really is a beacon */