break;
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
+@@ -489,12 +489,12 @@ ieee80211_rx_mesh_check(struct ieee80211
+ if (ieee80211_has_tods(hdr->frame_control) ||
+ !ieee80211_has_fromds(hdr->frame_control))
+ return RX_DROP_MONITOR;
+- if (memcmp(hdr->addr3, dev_addr, ETH_ALEN) == 0)
++ if (compare_ether_addr(hdr->addr3, dev_addr) == 0)
+ return RX_DROP_MONITOR;
+ } else {
+ if (!ieee80211_has_a4(hdr->frame_control))
+ return RX_DROP_MONITOR;
+- if (memcmp(hdr->addr4, dev_addr, ETH_ALEN) == 0)
++ if (compare_ether_addr(hdr->addr4, dev_addr) == 0)
+ return RX_DROP_MONITOR;
+ }
+ }
@@ -2282,6 +2282,7 @@ ieee80211_rx_h_action(struct ieee80211_r
sdata->vif.type != NL80211_IFTYPE_MESH_POINT &&
sdata->vif.type != NL80211_IFTYPE_AP_VLAN &&
sdata->vif.type != NL80211_IFTYPE_ADHOC)
break;
+@@ -2336,7 +2337,7 @@ ieee80211_rx_h_action(struct ieee80211_r
+ if (sdata->vif.type != NL80211_IFTYPE_STATION)
+ break;
+
+- if (memcmp(mgmt->bssid, sdata->u.mgd.bssid, ETH_ALEN))
++ if (compare_ether_addr(mgmt->bssid, sdata->u.mgd.bssid))
+ break;
+
+ goto queue;
@@ -2492,14 +2493,15 @@ ieee80211_rx_h_mgmt(struct ieee80211_rx_
if (!ieee80211_vif_is_mesh(&sdata->vif) &&
/* should never get here */
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
-@@ -1050,7 +1050,7 @@ static void ieee80211_send_null_response
+@@ -9,6 +9,7 @@
+
+ #include <linux/module.h>
+ #include <linux/init.h>
++#include <linux/etherdevice.h>
+ #include <linux/netdevice.h>
+ #include <linux/types.h>
+ #include <linux/slab.h>
+@@ -101,7 +102,7 @@ struct sta_info *sta_info_get(struct iee
+ lockdep_is_held(&local->sta_mtx));
+ while (sta) {
+ if (sta->sdata == sdata &&
+- memcmp(sta->sta.addr, addr, ETH_ALEN) == 0)
++ compare_ether_addr(sta->sta.addr, addr) == 0)
+ break;
+ sta = rcu_dereference_check(sta->hnext,
+ lockdep_is_held(&local->sta_mtx));
+@@ -124,7 +125,7 @@ struct sta_info *sta_info_get_bss(struct
+ while (sta) {
+ if ((sta->sdata == sdata ||
+ (sta->sdata->bss && sta->sdata->bss == sdata->bss)) &&
+- memcmp(sta->sta.addr, addr, ETH_ALEN) == 0)
++ compare_ether_addr(sta->sta.addr, addr) == 0)
+ break;
+ sta = rcu_dereference_check(sta->hnext,
+ lockdep_is_held(&local->sta_mtx));
+@@ -1050,7 +1051,7 @@ static void ieee80211_send_null_response
* exchange. Also set EOSP to indicate this packet
* ends the poll/service period.
*/
IEEE80211_TX_STATUS_EOSP |
IEEE80211_TX_CTL_REQ_TX_STATUS;
-@@ -1177,7 +1177,7 @@ ieee80211_sta_ps_deliver_response(struct
+@@ -1177,7 +1178,7 @@ ieee80211_sta_ps_deliver_response(struct
* STA may still remain is PS mode after this frame
* exchange.
*/
* Use MoreData flag to indicate whether there are
--- a/net/mac80211/sta_info.h
+++ b/net/mac80211/sta_info.h
-@@ -31,7 +31,6 @@
+@@ -14,6 +14,7 @@
+ #include <linux/if_ether.h>
+ #include <linux/workqueue.h>
+ #include <linux/average.h>
++#include <linux/etherdevice.h>
+ #include "key.h"
+
+ /**
+@@ -31,7 +32,6 @@
* @WLAN_STA_SHORT_PREAMBLE: Station is capable of receiving short-preamble
* frames.
* @WLAN_STA_WME: Station is a QoS-STA.
* @WLAN_STA_CLEAR_PS_FILT: Clear PS filter in hardware (using the
* IEEE80211_TX_CTL_CLEAR_PS_FILT control flag) when the next
* frame to this station is transmitted.
-@@ -62,7 +61,6 @@ enum ieee80211_sta_info_flags {
+@@ -62,7 +62,6 @@ enum ieee80211_sta_info_flags {
WLAN_STA_AUTHORIZED,
WLAN_STA_SHORT_PREAMBLE,
WLAN_STA_WME,
WLAN_STA_CLEAR_PS_FILT,
WLAN_STA_MFP,
WLAN_STA_BLOCK_BA,
+@@ -489,7 +488,7 @@ void for_each_sta_info_type_check(struct
+ nxt = _sta ? rcu_dereference(_sta->hnext) : NULL \
+ ) \
+ /* compare address and run code only if it matches */ \
+- if (memcmp(_sta->sta.addr, (_addr), ETH_ALEN) == 0)
++ if (compare_ether_addr(_sta->sta.addr, (_addr)) == 0)
+
+ /*
+ * Get STA info by index, BROKEN!
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -448,18 +448,23 @@ ieee80211_tx_h_unicast_ps_buf(struct iee
u8 ssid[IEEE80211_MAX_SSID_LEN];
u8 ssid_len, ie_len;
u8 *ie;
+--- a/net/mac80211/ibss.c
++++ b/net/mac80211/ibss.c
+@@ -66,7 +66,7 @@ static void __ieee80211_sta_join_ibss(st
+ skb_reset_tail_pointer(skb);
+ skb_reserve(skb, sdata->local->hw.extra_tx_headroom);
+
+- if (memcmp(ifibss->bssid, bssid, ETH_ALEN))
++ if (compare_ether_addr(ifibss->bssid, bssid))
+ sta_info_flush(sdata->local, sdata);
+
+ /* if merging, indicate to driver that we leave the old IBSS */
+@@ -403,7 +403,7 @@ static void ieee80211_rx_bss_info(struct
+ return;
+
+ if (sdata->vif.type == NL80211_IFTYPE_ADHOC &&
+- memcmp(mgmt->bssid, sdata->u.ibss.bssid, ETH_ALEN) == 0) {
++ compare_ether_addr(mgmt->bssid, sdata->u.ibss.bssid) == 0) {
+
+ rcu_read_lock();
+ sta = sta_info_get(sdata, mgmt->sa);
+@@ -508,7 +508,7 @@ static void ieee80211_rx_bss_info(struct
+ goto put_bss;
+
+ /* same BSSID */
+- if (memcmp(cbss->bssid, sdata->u.ibss.bssid, ETH_ALEN) == 0)
++ if (compare_ether_addr(cbss->bssid, sdata->u.ibss.bssid) == 0)
+ goto put_bss;
+
+ if (rx_status->flag & RX_FLAG_MACTIME_MPDU) {
+@@ -831,8 +831,8 @@ static void ieee80211_rx_mgmt_probe_req(
+ if (!tx_last_beacon && is_multicast_ether_addr(mgmt->da))
+ return;
+
+- if (memcmp(mgmt->bssid, ifibss->bssid, ETH_ALEN) != 0 &&
+- memcmp(mgmt->bssid, "\xff\xff\xff\xff\xff\xff", ETH_ALEN) != 0)
++ if (compare_ether_addr(mgmt->bssid, ifibss->bssid) != 0 &&
++ !is_broadcast_ether_addr(mgmt->bssid))
+ return;
+
+ end = ((u8 *) mgmt) + len;
+--- a/net/mac80211/mesh.c
++++ b/net/mac80211/mesh.c
+@@ -204,7 +204,7 @@ int mesh_rmc_check(u8 *sa, struct ieee80
+ kmem_cache_free(rm_cache, p);
+ --entries;
+ } else if ((seqnum == p->seqnum) &&
+- (memcmp(sa, p->sa, ETH_ALEN) == 0))
++ (compare_ether_addr(sa, p->sa) == 0))
+ return -1;
+ }
+
+--- a/net/mac80211/mesh_hwmp.c
++++ b/net/mac80211/mesh_hwmp.c
+@@ -8,6 +8,7 @@
+ */
+
+ #include <linux/slab.h>
++#include <linux/etherdevice.h>
+ #include <asm/unaligned.h>
+ #include "wme.h"
+ #include "mesh.h"
+@@ -419,7 +420,7 @@ static u32 hwmp_route_info_get(struct ie
+ new_metric = MAX_METRIC;
+ exp_time = TU_TO_EXP_TIME(orig_lifetime);
+
+- if (memcmp(orig_addr, sdata->vif.addr, ETH_ALEN) == 0) {
++ if (compare_ether_addr(orig_addr, sdata->vif.addr) == 0) {
+ /* This MP is the originator, we are not interested in this
+ * frame, except for updating transmitter's path info.
+ */
+@@ -469,7 +470,7 @@ static u32 hwmp_route_info_get(struct ie
+
+ /* Update and check transmitter routing info */
+ ta = mgmt->sa;
+- if (memcmp(orig_addr, ta, ETH_ALEN) == 0)
++ if (compare_ether_addr(orig_addr, ta) == 0)
+ fresh_info = false;
+ else {
+ fresh_info = true;
+@@ -529,7 +530,7 @@ static void hwmp_preq_frame_process(stru
+
+ mhwmp_dbg("received PREQ from %pM", orig_addr);
+
+- if (memcmp(target_addr, sdata->vif.addr, ETH_ALEN) == 0) {
++ if (compare_ether_addr(target_addr, sdata->vif.addr) == 0) {
+ mhwmp_dbg("PREQ is for us");
+ forward = false;
+ reply = true;
+@@ -624,7 +625,7 @@ static void hwmp_prep_frame_process(stru
+ mhwmp_dbg("received PREP from %pM", PREP_IE_ORIG_ADDR(prep_elem));
+
+ orig_addr = PREP_IE_ORIG_ADDR(prep_elem);
+- if (memcmp(orig_addr, sdata->vif.addr, ETH_ALEN) == 0)
++ if (compare_ether_addr(orig_addr, sdata->vif.addr) == 0)
+ /* destination, no forwarding required */
+ return;
+
+@@ -694,10 +695,12 @@ static void hwmp_perr_frame_process(stru
+ rcu_read_lock();
+ mpath = mesh_path_lookup(target_addr, sdata);
+ if (mpath) {
++ struct sta_info *sta;
++
+ spin_lock_bh(&mpath->state_lock);
++ sta = next_hop_deref_protected(mpath);
+ if (mpath->flags & MESH_PATH_ACTIVE &&
+- memcmp(ta, next_hop_deref_protected(mpath)->sta.addr,
+- ETH_ALEN) == 0 &&
++ compare_ether_addr(ta, sta->sta.addr) == 0 &&
+ (!(mpath->flags & MESH_PATH_SN_VALID) ||
+ SN_GT(target_sn, mpath->sn))) {
+ mpath->flags &= ~MESH_PATH_ACTIVE;
+@@ -739,7 +742,7 @@ static void hwmp_rann_frame_process(stru
+ metric = rann->rann_metric;
+
+ /* Ignore our own RANNs */
+- if (memcmp(orig_addr, sdata->vif.addr, ETH_ALEN) == 0)
++ if (compare_ether_addr(orig_addr, sdata->vif.addr) == 0)
+ return;
+
+ mhwmp_dbg("received RANN from %pM (is_gate=%d)", orig_addr,
+@@ -1064,7 +1067,7 @@ int mesh_nexthop_lookup(struct sk_buff *
+ if (time_after(jiffies,
+ mpath->exp_time -
+ msecs_to_jiffies(sdata->u.mesh.mshcfg.path_refresh_time)) &&
+- !memcmp(sdata->vif.addr, hdr->addr4, ETH_ALEN) &&
++ !compare_ether_addr(sdata->vif.addr, hdr->addr4) &&
+ !(mpath->flags & MESH_PATH_RESOLVING) &&
+ !(mpath->flags & MESH_PATH_FIXED))
+ mesh_queue_preq(mpath, PREQ_Q_F_START | PREQ_Q_F_REFRESH);
+--- a/net/mac80211/mesh_pathtbl.c
++++ b/net/mac80211/mesh_pathtbl.c
+@@ -350,7 +350,7 @@ static struct mesh_path *mpath_lookup(st
+ hlist_for_each_entry_rcu(node, n, bucket, list) {
+ mpath = node->mpath;
+ if (mpath->sdata == sdata &&
+- memcmp(dst, mpath->dst, ETH_ALEN) == 0) {
++ compare_ether_addr(dst, mpath->dst) == 0) {
+ if (MPATH_EXPIRED(mpath)) {
+ spin_lock_bh(&mpath->state_lock);
+ mpath->flags &= ~MESH_PATH_ACTIVE;
+@@ -525,7 +525,7 @@ int mesh_path_add(u8 *dst, struct ieee80
+ int err = 0;
+ u32 hash_idx;
+
+- if (memcmp(dst, sdata->vif.addr, ETH_ALEN) == 0)
++ if (compare_ether_addr(dst, sdata->vif.addr) == 0)
+ /* never add ourselves as neighbours */
+ return -ENOTSUPP;
+
+@@ -566,7 +566,8 @@ int mesh_path_add(u8 *dst, struct ieee80
+ err = -EEXIST;
+ hlist_for_each_entry(node, n, bucket, list) {
+ mpath = node->mpath;
+- if (mpath->sdata == sdata && memcmp(dst, mpath->dst, ETH_ALEN) == 0)
++ if (mpath->sdata == sdata &&
++ compare_ether_addr(dst, mpath->dst) == 0)
+ goto err_exists;
+ }
+
+@@ -657,7 +658,7 @@ int mpp_path_add(u8 *dst, u8 *mpp, struc
+ int err = 0;
+ u32 hash_idx;
+
+- if (memcmp(dst, sdata->vif.addr, ETH_ALEN) == 0)
++ if (compare_ether_addr(dst, sdata->vif.addr) == 0)
+ /* never add ourselves as neighbours */
+ return -ENOTSUPP;
+
+@@ -694,7 +695,8 @@ int mpp_path_add(u8 *dst, u8 *mpp, struc
+ err = -EEXIST;
+ hlist_for_each_entry(node, n, bucket, list) {
+ mpath = node->mpath;
+- if (mpath->sdata == sdata && memcmp(dst, mpath->dst, ETH_ALEN) == 0)
++ if (mpath->sdata == sdata &&
++ compare_ether_addr(dst, mpath->dst) == 0)
+ goto err_exists;
+ }
+
+@@ -887,7 +889,7 @@ int mesh_path_del(u8 *addr, struct ieee8
+ hlist_for_each_entry(node, n, bucket, list) {
+ mpath = node->mpath;
+ if (mpath->sdata == sdata &&
+- memcmp(addr, mpath->dst, ETH_ALEN) == 0) {
++ compare_ether_addr(addr, mpath->dst) == 0) {
+ __mesh_path_del(tbl, node);
+ goto enddel;
+ }
+--- a/net/mac80211/mlme.c
++++ b/net/mac80211/mlme.c
+@@ -1812,7 +1812,7 @@ ieee80211_rx_mgmt_auth(struct ieee80211_
+
+ memcpy(bssid, ifmgd->auth_data->bss->bssid, ETH_ALEN);
+
+- if (memcmp(bssid, mgmt->bssid, ETH_ALEN))
++ if (compare_ether_addr(bssid, mgmt->bssid))
+ return RX_MGMT_NONE;
+
+ auth_alg = le16_to_cpu(mgmt->u.auth.auth_alg);
+@@ -1893,7 +1893,7 @@ ieee80211_rx_mgmt_deauth(struct ieee8021
+ return RX_MGMT_NONE;
+
+ if (!ifmgd->associated ||
+- memcmp(mgmt->bssid, ifmgd->associated->bssid, ETH_ALEN))
++ compare_ether_addr(mgmt->bssid, ifmgd->associated->bssid))
+ return RX_MGMT_NONE;
+
+ bssid = ifmgd->associated->bssid;
+@@ -1925,7 +1925,7 @@ ieee80211_rx_mgmt_disassoc(struct ieee80
+ return RX_MGMT_NONE;
+
+ if (!ifmgd->associated ||
+- memcmp(mgmt->bssid, ifmgd->associated->bssid, ETH_ALEN))
++ compare_ether_addr(mgmt->bssid, ifmgd->associated->bssid))
+ return RX_MGMT_NONE;
+
+ reason_code = le16_to_cpu(mgmt->u.disassoc.reason_code);
+@@ -2190,7 +2190,7 @@ ieee80211_rx_mgmt_assoc_resp(struct ieee
+
+ if (!assoc_data)
+ return RX_MGMT_NONE;
+- if (memcmp(assoc_data->bss->bssid, mgmt->bssid, ETH_ALEN))
++ if (compare_ether_addr(assoc_data->bss->bssid, mgmt->bssid))
+ return RX_MGMT_NONE;
+
+ /*
+@@ -2278,8 +2278,8 @@ static void ieee80211_rx_bss_info(struct
+ bool need_ps = false;
+
+ if (sdata->u.mgd.associated &&
+- memcmp(mgmt->bssid, sdata->u.mgd.associated->bssid,
+- ETH_ALEN) == 0) {
++ compare_ether_addr(mgmt->bssid, sdata->u.mgd.associated->bssid)
++ == 0) {
+ bss = (void *)sdata->u.mgd.associated->priv;
+ /* not previously set so we may need to recalc */
+ need_ps = !bss->dtim_period;
+@@ -2334,7 +2334,7 @@ static void ieee80211_rx_mgmt_probe_resp
+
+ ASSERT_MGD_MTX(ifmgd);
+
+- if (memcmp(mgmt->da, sdata->vif.addr, ETH_ALEN))
++ if (compare_ether_addr(mgmt->da, sdata->vif.addr))
+ return; /* ignore ProbeResp to foreign address */
+
+ baselen = (u8 *) mgmt->u.probe_resp.variable - (u8 *) mgmt;
+@@ -2347,11 +2347,12 @@ static void ieee80211_rx_mgmt_probe_resp
+ ieee80211_rx_bss_info(sdata, mgmt, len, rx_status, &elems, false);
+
+ if (ifmgd->associated &&
+- memcmp(mgmt->bssid, ifmgd->associated->bssid, ETH_ALEN) == 0)
++ compare_ether_addr(mgmt->bssid, ifmgd->associated->bssid) == 0)
+ ieee80211_reset_ap_probe(sdata);
+
+ if (ifmgd->auth_data && !ifmgd->auth_data->bss->proberesp_ies &&
+- memcmp(mgmt->bssid, ifmgd->auth_data->bss->bssid, ETH_ALEN) == 0) {
++ compare_ether_addr(mgmt->bssid, ifmgd->auth_data->bss->bssid)
++ == 0) {
+ /* got probe response, continue with auth */
+ printk(KERN_DEBUG "%s: direct probe responded\n", sdata->name);
+ ifmgd->auth_data->tries = 0;
+@@ -2408,7 +2409,8 @@ static void ieee80211_rx_mgmt_beacon(str
+ return;
+
+ if (ifmgd->assoc_data && !ifmgd->assoc_data->have_beacon &&
+- memcmp(mgmt->bssid, ifmgd->assoc_data->bss->bssid, ETH_ALEN) == 0) {
++ compare_ether_addr(mgmt->bssid, ifmgd->assoc_data->bss->bssid)
++ == 0) {
+ ieee802_11_parse_elems(mgmt->u.beacon.variable,
+ len - baselen, &elems);
+
+@@ -2423,7 +2425,7 @@ static void ieee80211_rx_mgmt_beacon(str
+ }
+
+ if (!ifmgd->associated ||
+- memcmp(mgmt->bssid, ifmgd->associated->bssid, ETH_ALEN))
++ compare_ether_addr(mgmt->bssid, ifmgd->associated->bssid))
+ return;
+ bssid = ifmgd->associated->bssid;
+
+@@ -3285,7 +3287,7 @@ int ieee80211_mgd_assoc(struct ieee80211
+ bool match;
+
+ /* keep sta info, bssid if matching */
+- match = memcmp(ifmgd->bssid, req->bss->bssid, ETH_ALEN) == 0;
++ match = compare_ether_addr(ifmgd->bssid, req->bss->bssid) == 0;
+ ieee80211_destroy_auth_data(sdata, match);
+ }
+
+@@ -3407,7 +3409,7 @@ int ieee80211_mgd_assoc(struct ieee80211
+ goto err_clear;
+ }
+ } else
+- WARN_ON_ONCE(memcmp(ifmgd->bssid, req->bss->bssid, ETH_ALEN));
++ WARN_ON_ONCE(compare_ether_addr(ifmgd->bssid, req->bss->bssid));
+
+ if (!bss->dtim_period &&
+ sdata->local->hw.flags & IEEE80211_HW_NEED_DTIM_PERIOD) {
+@@ -3448,7 +3450,7 @@ int ieee80211_mgd_deauth(struct ieee8021
+ mutex_lock(&ifmgd->mtx);
+
+ if (ifmgd->associated &&
+- memcmp(ifmgd->associated->bssid, req->bssid, ETH_ALEN) == 0) {
++ compare_ether_addr(ifmgd->associated->bssid, req->bssid) == 0) {
+ ieee80211_set_disassoc(sdata, false, true);
+ assoc_bss = true;
+ } else if (ifmgd->auth_data) {
+--- a/net/mac80211/status.c
++++ b/net/mac80211/status.c
+@@ -10,6 +10,7 @@
+ */
+
+ #include <linux/export.h>
++#include <linux/etherdevice.h>
+ #include <net/mac80211.h>
+ #include <asm/unaligned.h>
+ #include "ieee80211_i.h"
+@@ -377,7 +378,7 @@ void ieee80211_tx_status(struct ieee8021
+
+ for_each_sta_info(local, hdr->addr1, sta, tmp) {
+ /* skip wrong virtual interface */
+- if (memcmp(hdr->addr2, sta->sdata->vif.addr, ETH_ALEN))
++ if (compare_ether_addr(hdr->addr2, sta->sdata->vif.addr))
+ continue;
+
+ if (info->flags & IEEE80211_TX_STATUS_EOSP)
+--- a/net/wireless/mlme.c
++++ b/net/wireless/mlme.c
+@@ -6,6 +6,7 @@
+
+ #include <linux/kernel.h>
+ #include <linux/module.h>
++#include <linux/etherdevice.h>
+ #include <linux/netdevice.h>
+ #include <linux/nl80211.h>
+ #include <linux/slab.h>
+@@ -100,7 +101,7 @@ void __cfg80211_send_deauth(struct net_d
+ ASSERT_WDEV_LOCK(wdev);
+
+ if (wdev->current_bss &&
+- memcmp(wdev->current_bss->pub.bssid, bssid, ETH_ALEN) == 0) {
++ compare_ether_addr(wdev->current_bss->pub.bssid, bssid) == 0) {
+ cfg80211_unhold_bss(wdev->current_bss);
+ cfg80211_put_bss(&wdev->current_bss->pub);
+ wdev->current_bss = NULL;
+@@ -115,7 +116,7 @@ void __cfg80211_send_deauth(struct net_d
+
+ reason_code = le16_to_cpu(mgmt->u.deauth.reason_code);
+
+- from_ap = memcmp(mgmt->sa, dev->dev_addr, ETH_ALEN) != 0;
++ from_ap = compare_ether_addr(mgmt->sa, dev->dev_addr) != 0;
+ __cfg80211_disconnected(dev, NULL, 0, reason_code, from_ap);
+ } else if (wdev->sme_state == CFG80211_SME_CONNECTING) {
+ __cfg80211_connect_result(dev, mgmt->bssid, NULL, 0, NULL, 0,
+@@ -154,7 +155,7 @@ void __cfg80211_send_disassoc(struct net
+ return;
+
+ if (wdev->current_bss &&
+- memcmp(wdev->current_bss->pub.bssid, bssid, ETH_ALEN) == 0) {
++ compare_ether_addr(wdev->current_bss->pub.bssid, bssid) == 0) {
+ cfg80211_sme_disassoc(dev, wdev->current_bss);
+ cfg80211_unhold_bss(wdev->current_bss);
+ cfg80211_put_bss(&wdev->current_bss->pub);
+@@ -165,7 +166,7 @@ void __cfg80211_send_disassoc(struct net
+
+ reason_code = le16_to_cpu(mgmt->u.disassoc.reason_code);
+
+- from_ap = memcmp(mgmt->sa, dev->dev_addr, ETH_ALEN) != 0;
++ from_ap = compare_ether_addr(mgmt->sa, dev->dev_addr) != 0;
+ __cfg80211_disconnected(dev, NULL, 0, reason_code, from_ap);
+ }
+ EXPORT_SYMBOL(__cfg80211_send_disassoc);
+@@ -285,7 +286,7 @@ int __cfg80211_mlme_auth(struct cfg80211
+ return -EINVAL;
+
+ if (wdev->current_bss &&
+- memcmp(bssid, wdev->current_bss->pub.bssid, ETH_ALEN) == 0)
++ compare_ether_addr(bssid, wdev->current_bss->pub.bssid) == 0)
+ return -EALREADY;
+
+ memset(&req, 0, sizeof(req));
+@@ -362,7 +363,7 @@ int __cfg80211_mlme_assoc(struct cfg8021
+ memset(&req, 0, sizeof(req));
+
+ if (wdev->current_bss && prev_bssid &&
+- memcmp(wdev->current_bss->pub.bssid, prev_bssid, ETH_ALEN) == 0) {
++ compare_ether_addr(wdev->current_bss->pub.bssid, prev_bssid) == 0) {
+ /*
+ * Trying to reassociate: Allow this to proceed and let the old
+ * association to be dropped when the new one is completed.
+@@ -446,7 +447,8 @@ int __cfg80211_mlme_deauth(struct cfg802
+
+ if (local_state_change) {
+ if (wdev->current_bss &&
+- memcmp(wdev->current_bss->pub.bssid, bssid, ETH_ALEN) == 0) {
++ compare_ether_addr(wdev->current_bss->pub.bssid, bssid)
++ == 0) {
+ cfg80211_unhold_bss(wdev->current_bss);
+ cfg80211_put_bss(&wdev->current_bss->pub);
+ wdev->current_bss = NULL;
+@@ -495,7 +497,7 @@ static int __cfg80211_mlme_disassoc(stru
+ req.local_state_change = local_state_change;
+ req.ie = ie;
+ req.ie_len = ie_len;
+- if (memcmp(wdev->current_bss->pub.bssid, bssid, ETH_ALEN) == 0)
++ if (compare_ether_addr(wdev->current_bss->pub.bssid, bssid) == 0)
+ req.bss = &wdev->current_bss->pub;
+ else
+ return -ENOTCONN;
+@@ -758,8 +760,8 @@ int cfg80211_mlme_mgmt_tx(struct cfg8021
+ break;
+ }
+
+- if (memcmp(wdev->current_bss->pub.bssid,
+- mgmt->bssid, ETH_ALEN)) {
++ if (compare_ether_addr(wdev->current_bss->pub.bssid,
++ mgmt->bssid)) {
+ err = -ENOTCONN;
+ break;
+ }
+@@ -772,8 +774,8 @@ int cfg80211_mlme_mgmt_tx(struct cfg8021
+ break;
+
+ /* for station, check that DA is the AP */
+- if (memcmp(wdev->current_bss->pub.bssid,
+- mgmt->da, ETH_ALEN)) {
++ if (compare_ether_addr(wdev->current_bss->pub.bssid,
++ mgmt->da)) {
+ err = -ENOTCONN;
+ break;
+ }
+@@ -781,11 +783,11 @@ int cfg80211_mlme_mgmt_tx(struct cfg8021
+ case NL80211_IFTYPE_AP:
+ case NL80211_IFTYPE_P2P_GO:
+ case NL80211_IFTYPE_AP_VLAN:
+- if (memcmp(mgmt->bssid, dev->dev_addr, ETH_ALEN))
++ if (compare_ether_addr(mgmt->bssid, dev->dev_addr))
+ err = -EINVAL;
+ break;
+ case NL80211_IFTYPE_MESH_POINT:
+- if (memcmp(mgmt->sa, mgmt->bssid, ETH_ALEN)) {
++ if (compare_ether_addr(mgmt->sa, mgmt->bssid)) {
+ err = -EINVAL;
+ break;
+ }
+@@ -804,7 +806,7 @@ int cfg80211_mlme_mgmt_tx(struct cfg8021
+ return err;
+ }
+
+- if (memcmp(mgmt->sa, dev->dev_addr, ETH_ALEN) != 0)
++ if (compare_ether_addr(mgmt->sa, dev->dev_addr) != 0)
+ return -EINVAL;
+
+ /* Transmit the Action frame as requested by user space */
+--- a/net/wireless/scan.c
++++ b/net/wireless/scan.c
+@@ -378,7 +378,7 @@ static int cmp_bss_core(struct cfg80211_
+ b->len_information_elements);
+ }
+
+- return memcmp(a->bssid, b->bssid, ETH_ALEN);
++ return compare_ether_addr(a->bssid, b->bssid);
+ }
+
+ static int cmp_bss(struct cfg80211_bss *a,
+--- a/drivers/net/wireless/ath/ath9k/Kconfig
++++ b/drivers/net/wireless/ath/ath9k/Kconfig
+@@ -81,6 +81,14 @@ config ATH9K_DFS_CERTIFIED
+ developed. At this point enabling this option won't do anything
+ except increase code size.
+
++config ATH9K_MAC_DEBUG
++ bool "Atheros MAC statistics"
++ depends on ATH9K_DEBUGFS
++ default y
++ ---help---
++ This option enables collection of statistics for Rx/Tx status
++ data and some other MAC related statistics
++
+ config ATH9K_RATE_CONTROL
+ bool "Atheros ath9k rate control"
+ depends on ATH9K
+--- a/drivers/net/wireless/ath/ath9k/debug.c
++++ b/drivers/net/wireless/ath/ath9k/debug.c
+@@ -818,6 +818,7 @@ void ath_debug_stat_tx(struct ath_softc
+ if (ts->ts_flags & ATH9K_TX_DELIM_UNDERRUN)
+ TX_STAT_INC(qnum, delim_underrun);
+
++#ifdef CONFIG_ATH9K_MAC_DEBUG
+ spin_lock(&sc->debug.samp_lock);
+ TX_SAMP_DBG(jiffies) = jiffies;
+ TX_SAMP_DBG(rssi_ctl0) = ts->ts_rssi_ctl0;
+@@ -844,6 +845,7 @@ void ath_debug_stat_tx(struct ath_softc
+
+ sc->debug.tsidx = (sc->debug.tsidx + 1) % ATH_DBG_MAX_SAMPLES;
+ spin_unlock(&sc->debug.samp_lock);
++#endif
+
+ #undef TX_SAMP_DBG
+ }
+@@ -1019,6 +1021,7 @@ void ath_debug_stat_rx(struct ath_softc
+
+ sc->debug.stats.rxstats.rs_antenna = rs->rs_antenna;
+
++#ifdef CONFIG_ATH9K_MAC_DEBUG
+ spin_lock(&sc->debug.samp_lock);
+ RX_SAMP_DBG(jiffies) = jiffies;
+ RX_SAMP_DBG(rssi_ctl0) = rs->rs_rssi_ctl0;
+@@ -1035,6 +1038,8 @@ void ath_debug_stat_rx(struct ath_softc
+ sc->debug.rsidx = (sc->debug.rsidx + 1) % ATH_DBG_MAX_SAMPLES;
+ spin_unlock(&sc->debug.samp_lock);
+
++#endif
++
+ #undef RX_STAT_INC
+ #undef RX_PHY_ERR_INC
+ #undef RX_SAMP_DBG
+@@ -1278,6 +1283,8 @@ static const struct file_operations fops
+ .llseek = default_llseek,
+ };
+
++#ifdef CONFIG_ATH9K_MAC_DEBUG
++
+ void ath9k_debug_samp_bb_mac(struct ath_softc *sc)
+ {
+ #define ATH_SAMP_DBG(c) (sc->debug.bb_mac_samp[sc->debug.sampidx].c)
+@@ -1551,6 +1558,7 @@ static const struct file_operations fops
+ .llseek = default_llseek,
+ };
+
++#endif
+
+ int ath9k_init_debug(struct ath_hw *ah)
+ {
+@@ -1604,8 +1612,10 @@ int ath9k_init_debug(struct ath_hw *ah)
+ &fops_base_eeprom);
+ debugfs_create_file("modal_eeprom", S_IRUSR, sc->debug.debugfs_phy, sc,
+ &fops_modal_eeprom);
++#ifdef CONFIG_ATH9K_MAC_DEBUG
+ debugfs_create_file("samples", S_IRUSR, sc->debug.debugfs_phy, sc,
+ &fops_samps);
++#endif
+
+ debugfs_create_u32("gpio_mask", S_IRUSR | S_IWUSR,
+ sc->debug.debugfs_phy, &sc->sc_ah->gpio_mask);
+--- a/drivers/net/wireless/ath/ath9k/debug.h
++++ b/drivers/net/wireless/ath/ath9k/debug.h
+@@ -235,16 +235,17 @@ struct ath9k_debug {
+ struct dentry *debugfs_phy;
+ u32 regidx;
+ struct ath_stats stats;
++#ifdef CONFIG_ATH9K_MAC_DEBUG
+ spinlock_t samp_lock;
+ struct ath_dbg_bb_mac_samp bb_mac_samp[ATH_DBG_MAX_SAMPLES];
+ u8 sampidx;
+ u8 tsidx;
+ u8 rsidx;
++#endif
+ };
+
+ int ath9k_init_debug(struct ath_hw *ah);
+
+-void ath9k_debug_samp_bb_mac(struct ath_softc *sc);
+ void ath_debug_stat_interrupt(struct ath_softc *sc, enum ath9k_int status);
+ void ath_debug_stat_tx(struct ath_softc *sc, struct ath_buf *bf,
+ struct ath_tx_status *ts, struct ath_txq *txq,
+@@ -258,10 +259,6 @@ static inline int ath9k_init_debug(struc
+ return 0;
+ }
+
+-static inline void ath9k_debug_samp_bb_mac(struct ath_softc *sc)
+-{
+-}
+-
+ static inline void ath_debug_stat_interrupt(struct ath_softc *sc,
+ enum ath9k_int status)
+ {
+@@ -282,4 +279,17 @@ static inline void ath_debug_stat_rx(str
+
+ #endif /* CONFIG_ATH9K_DEBUGFS */
+
++#ifdef CONFIG_ATH9K_MAC_DEBUG
++
++void ath9k_debug_samp_bb_mac(struct ath_softc *sc);
++
++#else
++
++static inline void ath9k_debug_samp_bb_mac(struct ath_softc *sc)
++{
++}
++
++#endif
++
++
+ #endif /* DEBUG_H */
+--- a/drivers/net/wireless/ath/ath9k/init.c
++++ b/drivers/net/wireless/ath/ath9k/init.c
+@@ -555,9 +555,11 @@ static int ath9k_init_softc(u16 devid, s
+ mutex_init(&sc->mutex);
+ #ifdef CONFIG_ATH9K_DEBUGFS
+ spin_lock_init(&sc->nodes_lock);
+- spin_lock_init(&sc->debug.samp_lock);
+ INIT_LIST_HEAD(&sc->nodes);
+ #endif
++#ifdef CONFIG_ATH9K_MAC_DEBUG
++ spin_lock_init(&sc->debug.samp_lock);
++#endif
+ tasklet_init(&sc->intr_tq, ath9k_tasklet, (unsigned long)sc);
+ tasklet_init(&sc->bcon_tasklet, ath_beacon_tasklet,
+ (unsigned long)sc);
projects / openwrt / svn-archive / archive.git / blobdiff