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

Commit b203ca39 authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files

mac80211: 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: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c47fc981

net/mac80211/cfg.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -919,7 +919,7 @@ static int ieee80211_add_station(struct wiphy *wiphy, struct net_device *dev, 
	} else

	} else

		sdata = IEEE80211_DEV_TO_SUB_IF(dev);

		sdata = IEEE80211_DEV_TO_SUB_IF(dev);





	if (compare_ether_addr(mac, sdata->vif.addr) == 0)

	if (ether_addr_equal(mac, sdata->vif.addr))

		return -EINVAL;

		return -EINVAL;





	if (is_multicast_ether_addr(mac))

	if (is_multicast_ether_addr(mac))

net/mac80211/ibss.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -66,7 +66,7 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata, 
	skb_reset_tail_pointer(skb);

	skb_reset_tail_pointer(skb);

	skb_reserve(skb, sdata->local->hw.extra_tx_headroom);

	skb_reserve(skb, sdata->local->hw.extra_tx_headroom);





	if (compare_ether_addr(ifibss->bssid, bssid))

	if (!ether_addr_equal(ifibss->bssid, bssid))

		sta_info_flush(sdata->local, sdata);

		sta_info_flush(sdata->local, sdata);





	/* if merging, indicate to driver that we leave the old IBSS */

	/* if merging, indicate to driver that we leave the old IBSS */
@@ -315,7 +315,7 @@ ieee80211_ibss_add_sta(struct ieee80211_sub_if_data *sdata, 
		return NULL;

		return NULL;

	}

	}





	if (compare_ether_addr(bssid, sdata->u.ibss.bssid)) {

	if (!ether_addr_equal(bssid, sdata->u.ibss.bssid)) {

		rcu_read_lock();

		rcu_read_lock();

		return NULL;

		return NULL;

	}

	}
@@ -401,7 +401,7 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata, 
		return;

		return;





	if (sdata->vif.type == NL80211_IFTYPE_ADHOC &&

	if (sdata->vif.type == NL80211_IFTYPE_ADHOC &&

	    compare_ether_addr(mgmt->bssid, sdata->u.ibss.bssid) == 0) {

	    ether_addr_equal(mgmt->bssid, sdata->u.ibss.bssid)) {





		rcu_read_lock();

		rcu_read_lock();

		sta = sta_info_get(sdata, mgmt->sa);

		sta = sta_info_get(sdata, mgmt->sa);
@@ -506,7 +506,7 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata, 
		goto put_bss;

		goto put_bss;





	/* same BSSID */

	/* same BSSID */

	if (compare_ether_addr(cbss->bssid, sdata->u.ibss.bssid) == 0)

	if (ether_addr_equal(cbss->bssid, sdata->u.ibss.bssid))

		goto put_bss;

		goto put_bss;





	if (rx_status->flag & RX_FLAG_MACTIME_MPDU) {

	if (rx_status->flag & RX_FLAG_MACTIME_MPDU) {
@@ -591,7 +591,7 @@ void ieee80211_ibss_rx_no_sta(struct ieee80211_sub_if_data *sdata, 
	if (ifibss->state == IEEE80211_IBSS_MLME_SEARCH)

	if (ifibss->state == IEEE80211_IBSS_MLME_SEARCH)

		return;

		return;





	if (compare_ether_addr(bssid, sdata->u.ibss.bssid))

	if (!ether_addr_equal(bssid, sdata->u.ibss.bssid))

		return;

		return;





	sta = sta_info_alloc(sdata, addr, GFP_ATOMIC);

	sta = sta_info_alloc(sdata, addr, GFP_ATOMIC);
@@ -829,7 +829,7 @@ static void ieee80211_rx_mgmt_probe_req(struct ieee80211_sub_if_data *sdata, 
	if (!tx_last_beacon && is_multicast_ether_addr(mgmt->da))

	if (!tx_last_beacon && is_multicast_ether_addr(mgmt->da))

		return;

		return;





	if (compare_ether_addr(mgmt->bssid, ifibss->bssid) != 0 &&

	if (!ether_addr_equal(mgmt->bssid, ifibss->bssid) &&

	    !is_broadcast_ether_addr(mgmt->bssid))

	    !is_broadcast_ether_addr(mgmt->bssid))

		return;

		return;

net/mac80211/ieee80211_i.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -1195,7 +1195,7 @@ static inline struct ieee80211_local *hw_to_local( 




static inline int ieee80211_bssid_match(const u8 *raddr, const u8 *addr)

static inline int ieee80211_bssid_match(const u8 *raddr, const u8 *addr)

{

{

	return compare_ether_addr(raddr, addr) == 0 ||

	return ether_addr_equal(raddr, addr) ||

	       is_broadcast_ether_addr(raddr);

	       is_broadcast_ether_addr(raddr);

}

}

net/mac80211/iface.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -127,7 +127,7 @@ static int ieee80211_check_concurrent_iface(struct ieee80211_sub_if_data *sdata, 
			 * The remaining checks are only performed for interfaces

			 * The remaining checks are only performed for interfaces

			 * with the same MAC address.

			 * with the same MAC address.

			 */

			 */

			if (compare_ether_addr(dev->dev_addr, ndev->dev_addr))

			if (!ether_addr_equal(dev->dev_addr, ndev->dev_addr))

				continue;

				continue;





			/*

			/*

net/mac80211/mesh.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -209,7 +209,7 @@ int mesh_rmc_check(u8 *sa, struct ieee80211s_hdr *mesh_hdr, 
			kmem_cache_free(rm_cache, p);

			kmem_cache_free(rm_cache, p);

			--entries;

			--entries;

		} else if ((seqnum == p->seqnum) &&

		} else if ((seqnum == p->seqnum) &&

			   (compare_ether_addr(sa, p->sa) == 0))

			   (ether_addr_equal(sa, p->sa)))

			return -1;

			return -1;

	}

	}
@@ -639,7 +639,7 @@ static void ieee80211_mesh_rx_bcn_presp(struct ieee80211_sub_if_data *sdata, 




	/* ignore ProbeResp to foreign address */

	/* ignore ProbeResp to foreign address */

	if (stype == IEEE80211_STYPE_PROBE_RESP &&

	if (stype == IEEE80211_STYPE_PROBE_RESP &&

	    compare_ether_addr(mgmt->da, sdata->vif.addr))

	    !ether_addr_equal(mgmt->da, sdata->vif.addr))

		return;

		return;





	baselen = (u8 *) mgmt->u.probe_resp.variable - (u8 *) mgmt;

	baselen = (u8 *) mgmt->u.probe_resp.variable - (u8 *) mgmt;