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

Commit 1283ac10 authored by Julia Lawall's avatar Julia Lawall Committed by John W. Linville
Browse files

carl9170: 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,
ieee80211_bar defined in include/linux/ieee80211.h and
ath_common defined in drivers/net/wireless/ath/ath.h

This was done using Coccinelle (http://coccinelle.lip6.fr/

).

Signed-off-by: default avatarJulia Lawall <Julia.Lawall@lip6.fr>
Acked-by: default avatarChristian Lamparter <chunkeey@googlemail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 631c5273

drivers/net/wireless/ath/carl9170/rx.c

+3 −3
Original line number Diff line number Diff line
@@ -536,7 +536,7 @@ static void carl9170_ps_beacon(struct ar9170 *ar, void *data, unsigned int len) 
		return;



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

	if (!ether_addr_equal(hdr->addr3, ar->common.curbssid) ||

	if (!ether_addr_equal_64bits(hdr->addr3, ar->common.curbssid) ||

	    !ar->common.curaid)

		return;
@@ -602,8 +602,8 @@ static void carl9170_ba_check(struct ar9170 *ar, void *data, unsigned int len) 


		if (bar->start_seq_num == entry_bar->start_seq_num &&

		    TID_CHECK(bar->control, entry_bar->control) &&

		    ether_addr_equal(bar->ra, entry_bar->ta) &&

		    ether_addr_equal(bar->ta, entry_bar->ra)) {

		    ether_addr_equal_64bits(bar->ra, entry_bar->ta) &&

		    ether_addr_equal_64bits(bar->ta, entry_bar->ra)) {

			struct ieee80211_tx_info *tx_info;



			tx_info = IEEE80211_SKB_CB(entry_skb);