+--- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
++++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
+@@ -510,7 +510,11 @@ int ath9k_hw_process_rxdesc_edma(struct
+ */
+ if (rxsp->status11 & AR_CRCErr)
+ rxs->rs_status |= ATH9K_RXERR_CRC;
+- else if (rxsp->status11 & AR_PHYErr) {
++ else if (rxsp->status11 & AR_DecryptCRCErr)
++ rxs->rs_status |= ATH9K_RXERR_DECRYPT;
++ else if (rxsp->status11 & AR_MichaelErr)
++ rxs->rs_status |= ATH9K_RXERR_MIC;
++ if (rxsp->status11 & AR_PHYErr) {
+ phyerr = MS(rxsp->status11, AR_PHYErrCode);
+ /*
+ * If we reach a point here where AR_PostDelimCRCErr is
+@@ -532,11 +536,7 @@ int ath9k_hw_process_rxdesc_edma(struct
+ rxs->rs_status |= ATH9K_RXERR_PHY;
+ rxs->rs_phyerr = phyerr;
+ }
+-
+- } else if (rxsp->status11 & AR_DecryptCRCErr)
+- rxs->rs_status |= ATH9K_RXERR_DECRYPT;
+- else if (rxsp->status11 & AR_MichaelErr)
+- rxs->rs_status |= ATH9K_RXERR_MIC;
++ };
+ }
+
+ if (rxsp->status11 & AR_KeyMiss)
+--- a/drivers/net/wireless/ath/carl9170/tx.c
++++ b/drivers/net/wireless/ath/carl9170/tx.c
+@@ -1236,6 +1236,7 @@ static bool carl9170_tx_ps_drop(struct a
+ {
+ struct ieee80211_sta *sta;
+ struct carl9170_sta_info *sta_info;
++ struct ieee80211_tx_info *tx_info;
+
+ rcu_read_lock();
+ sta = __carl9170_get_tx_sta(ar, skb);
+@@ -1243,12 +1244,13 @@ static bool carl9170_tx_ps_drop(struct a
+ goto out_rcu;
+
+ sta_info = (void *) sta->drv_priv;
+- if (unlikely(sta_info->sleeping)) {
+- struct ieee80211_tx_info *tx_info;
++ tx_info = IEEE80211_SKB_CB(skb);
+
++ if (unlikely(sta_info->sleeping) &&
++ !(tx_info->flags & (IEEE80211_TX_CTL_NO_PS_BUFFER |
++ IEEE80211_TX_CTL_CLEAR_PS_FILT))) {
+ rcu_read_unlock();
+
+- tx_info = IEEE80211_SKB_CB(skb);
+ if (tx_info->flags & IEEE80211_TX_CTL_AMPDU)
+ atomic_dec(&ar->tx_ampdu_upload);
+
+--- a/drivers/net/wireless/iwlegacy/4965-mac.c
++++ b/drivers/net/wireless/iwlegacy/4965-mac.c
+@@ -1694,7 +1694,7 @@ il4965_tx_skb(struct il_priv *il, struct
+ sta_priv = (void *)sta->drv_priv;
+
+ if (sta_priv && sta_priv->asleep &&
+- (info->flags & IEEE80211_TX_CTL_POLL_RESPONSE)) {
++ (info->flags & IEEE80211_TX_CTL_NO_PS_BUFFER)) {
+ /*
+ * This sends an asynchronous command to the device,
+ * but we can rely on it being processed before the
+--- a/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
++++ b/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
+@@ -322,7 +322,7 @@ int iwlagn_tx_skb(struct iwl_priv *priv,
+ sta_priv = (void *)info->control.sta->drv_priv;
+
+ if (sta_priv && sta_priv->asleep &&
+- (info->flags & IEEE80211_TX_CTL_POLL_RESPONSE)) {
++ (info->flags & IEEE80211_TX_CTL_NO_PS_BUFFER)) {
+ /*
+ * This sends an asynchronous command to the device,
+ * but we can rely on it being processed before the
+@@ -331,6 +331,10 @@ int iwlagn_tx_skb(struct iwl_priv *priv,
+ * counter.
+ * For now set the counter to just 1 since we do not
+ * support uAPSD yet.
++ *
++ * FIXME: If we get two non-bufferable frames one
++ * after the other, we might only send out one of
++ * them because this is racy.
+ */
+ iwl_sta_modify_sleep_tx_count(priv, sta_id, 1);
+ }
+--- a/drivers/net/wireless/p54/txrx.c
++++ b/drivers/net/wireless/p54/txrx.c
+@@ -690,7 +690,7 @@ static void p54_tx_80211_header(struct p
+ if (!(info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ))
+ *flags |= P54_HDR_FLAG_DATA_OUT_SEQNR;
+
+- if (info->flags & IEEE80211_TX_CTL_POLL_RESPONSE)
++ if (info->flags & IEEE80211_TX_CTL_NO_PS_BUFFER)
+ *flags |= P54_HDR_FLAG_DATA_OUT_NOCANCEL;
+
+ if (info->flags & IEEE80211_TX_CTL_CLEAR_PS_FILT)
+--- a/include/net/mac80211.h
++++ b/include/net/mac80211.h
+@@ -341,9 +341,9 @@ struct ieee80211_bss_conf {
+ * used to indicate that a frame was already retried due to PS
+ * @IEEE80211_TX_INTFL_DONT_ENCRYPT: completely internal to mac80211,
+ * used to indicate frame should not be encrypted
+- * @IEEE80211_TX_CTL_POLL_RESPONSE: This frame is a response to a poll
+- * frame (PS-Poll or uAPSD) and should be sent although the station
+- * is in powersave mode.
++ * @IEEE80211_TX_CTL_NO_PS_BUFFER: This frame is a response to a poll
++ * frame (PS-Poll or uAPSD) or a non-bufferable MMPDU and must
++ * be sent although the station is in powersave mode.
+ * @IEEE80211_TX_CTL_MORE_FRAMES: More frames will be passed to the
+ * transmit function after the current frame, this can be used
+ * by drivers to kick the DMA queue only if unset or when the
+@@ -399,7 +399,7 @@ enum mac80211_tx_control_flags {
+ IEEE80211_TX_INTFL_NEED_TXPROCESSING = BIT(14),
+ IEEE80211_TX_INTFL_RETRIED = BIT(15),
+ IEEE80211_TX_INTFL_DONT_ENCRYPT = BIT(16),
+- IEEE80211_TX_CTL_POLL_RESPONSE = BIT(17),
++ IEEE80211_TX_CTL_NO_PS_BUFFER = BIT(17),
+ IEEE80211_TX_CTL_MORE_FRAMES = BIT(18),
+ IEEE80211_TX_INTFL_RETRANSMISSION = BIT(19),
+ /* hole at 20, use later */
+@@ -425,7 +425,7 @@ enum mac80211_tx_control_flags {
+ IEEE80211_TX_CTL_SEND_AFTER_DTIM | IEEE80211_TX_CTL_AMPDU | \
+ IEEE80211_TX_STAT_TX_FILTERED | IEEE80211_TX_STAT_ACK | \
+ IEEE80211_TX_STAT_AMPDU | IEEE80211_TX_STAT_AMPDU_NO_BACK | \
+- IEEE80211_TX_CTL_RATE_CTRL_PROBE | IEEE80211_TX_CTL_POLL_RESPONSE | \
++ IEEE80211_TX_CTL_RATE_CTRL_PROBE | IEEE80211_TX_CTL_NO_PS_BUFFER | \
+ IEEE80211_TX_CTL_MORE_FRAMES | IEEE80211_TX_CTL_LDPC | \
+ IEEE80211_TX_CTL_STBC | IEEE80211_TX_STATUS_EOSP)
+
+@@ -1634,7 +1634,7 @@ void ieee80211_free_txskb(struct ieee802
+ * the station sends a PS-Poll or a uAPSD trigger frame, mac80211
+ * will inform the driver of this with the @allow_buffered_frames
+ * callback; this callback is optional. mac80211 will then transmit
+- * the frames as usual and set the %IEEE80211_TX_CTL_POLL_RESPONSE
++ * the frames as usual and set the %IEEE80211_TX_CTL_NO_PS_BUFFER
+ * on each frame. The last frame in the service period (or the only
+ * response to a PS-Poll) also has %IEEE80211_TX_STATUS_EOSP set to
+ * indicate that it ends the service period; as this frame must have
+@@ -1642,6 +1642,9 @@ void ieee80211_free_txskb(struct ieee802
+ * When TX status is reported for this frame, the service period is
+ * marked has having ended and a new one can be started by the peer.
+ *
++ * Additionally, non-bufferable MMPDUs can also be transmitted by
++ * mac80211 with the %IEEE80211_TX_CTL_NO_PS_BUFFER set in them.
++ *
+ * Another race condition can happen on some devices like iwlwifi
+ * when there are frames queued for the station and it wakes up
+ * or polls; the frames that are already queued could end up being
+@@ -2140,7 +2143,7 @@ enum ieee80211_frame_release_type {
+ * @allow_buffered_frames: Prepare device to allow the given number of frames
+ * to go out to the given station. The frames will be sent by mac80211
+ * via the usual TX path after this call. The TX information for frames
+- * released will also have the %IEEE80211_TX_CTL_POLL_RESPONSE flag set
++ * released will also have the %IEEE80211_TX_CTL_NO_PS_BUFFER flag set
+ * and the last one will also have %IEEE80211_TX_STATUS_EOSP set. In case
+ * frames from multiple TIDs are released and the driver might reorder
+ * them between the TIDs, it must set the %IEEE80211_TX_STATUS_EOSP flag
--- a/net/mac80211/agg-rx.c
+++ b/net/mac80211/agg-rx.c
-@@ -176,6 +176,8 @@ static void ieee80211_send_addba_resp(st
- memcpy(mgmt->bssid, sdata->vif.addr, ETH_ALEN);
- else if (sdata->vif.type == NL80211_IFTYPE_STATION)
+@@ -187,6 +187,8 @@ static void ieee80211_send_addba_resp(st
memcpy(mgmt->bssid, sdata->u.mgd.bssid, ETH_ALEN);
+ else if (sdata->vif.type == NL80211_IFTYPE_ADHOC)
+ memcpy(mgmt->bssid, sdata->u.ibss.bssid, ETH_ALEN);
+ else if (sdata->vif.type == NL80211_IFTYPE_WDS)
+ memcpy(mgmt->bssid, da, ETH_ALEN);
mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
IEEE80211_STYPE_ACTION);
-@@ -262,7 +264,11 @@ void ieee80211_process_addba_request(str
- "%pM on tid %u\n",
- mgmt->sa, tid);
- #endif /* CONFIG_MAC80211_HT_DEBUG */
-- goto end;
-+
-+ /* delete existing Rx BA session on the same tid */
-+ ___ieee80211_stop_rx_ba_session(sta, tid, WLAN_BACK_RECIPIENT,
-+ WLAN_STATUS_UNSPECIFIED_QOS,
-+ false);
- }
-
- /* prepare A-MPDU MLME for Rx aggregation */
--- a/net/mac80211/agg-tx.c
+++ b/net/mac80211/agg-tx.c
-@@ -79,7 +79,8 @@ static void ieee80211_send_addba_request
- memcpy(mgmt->da, da, ETH_ALEN);
+@@ -81,7 +81,8 @@ static void ieee80211_send_addba_request
memcpy(mgmt->sa, sdata->vif.addr, ETH_ALEN);
if (sdata->vif.type == NL80211_IFTYPE_AP ||
-- sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
-+ sdata->vif.type == NL80211_IFTYPE_AP_VLAN ||
+ sdata->vif.type == NL80211_IFTYPE_AP_VLAN ||
+- sdata->vif.type == NL80211_IFTYPE_MESH_POINT)
++ sdata->vif.type == NL80211_IFTYPE_MESH_POINT ||
+ sdata->vif.type == NL80211_IFTYPE_WDS)
memcpy(mgmt->bssid, sdata->vif.addr, ETH_ALEN);
else if (sdata->vif.type == NL80211_IFTYPE_STATION)
memcpy(mgmt->bssid, sdata->u.mgd.bssid, ETH_ALEN);
-@@ -398,7 +399,8 @@ int ieee80211_start_tx_ba_session(struct
- */
- if (sdata->vif.type != NL80211_IFTYPE_STATION &&
+@@ -471,6 +472,7 @@ int ieee80211_start_tx_ba_session(struct
+ sdata->vif.type != NL80211_IFTYPE_MESH_POINT &&
sdata->vif.type != NL80211_IFTYPE_AP_VLAN &&
-- sdata->vif.type != NL80211_IFTYPE_AP)
-+ sdata->vif.type != NL80211_IFTYPE_AP &&
-+ sdata->vif.type != NL80211_IFTYPE_WDS)
+ sdata->vif.type != NL80211_IFTYPE_AP &&
++ sdata->vif.type != NL80211_IFTYPE_WDS &&
+ sdata->vif.type != NL80211_IFTYPE_ADHOC)
return -EINVAL;
- if (test_sta_flags(sta, WLAN_STA_BLOCK_BA)) {
--- a/net/mac80211/debugfs_sta.c
+++ b/net/mac80211/debugfs_sta.c
-@@ -59,7 +59,7 @@ static ssize_t sta_flags_read(struct fil
- char buf[100];
- struct sta_info *sta = file->private_data;
- u32 staflags = get_sta_flags(sta);
-- int res = scnprintf(buf, sizeof(buf), "%s%s%s%s%s%s%s%s%s",
-+ int res = scnprintf(buf, sizeof(buf), "%s%s%s%s%s%s%s%s",
- staflags & WLAN_STA_AUTH ? "AUTH\n" : "",
- staflags & WLAN_STA_ASSOC ? "ASSOC\n" : "",
- staflags & WLAN_STA_PS_STA ? "PS (sta)\n" : "",
-@@ -67,7 +67,6 @@ static ssize_t sta_flags_read(struct fil
- staflags & WLAN_STA_AUTHORIZED ? "AUTHORIZED\n" : "",
- staflags & WLAN_STA_SHORT_PREAMBLE ? "SHORT PREAMBLE\n" : "",
- staflags & WLAN_STA_WME ? "WME\n" : "",
-- staflags & WLAN_STA_WDS ? "WDS\n" : "",
- staflags & WLAN_STA_MFP ? "MFP\n" : "");
- return simple_read_from_buffer(userbuf, count, ppos, buf, res);
- }
+@@ -63,11 +63,11 @@ static ssize_t sta_flags_read(struct fil
+ test_sta_flag(sta, WLAN_STA_##flg) ? #flg "\n" : ""
+
+ int res = scnprintf(buf, sizeof(buf),
+- "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
++ "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
+ TEST(AUTH), TEST(ASSOC), TEST(PS_STA),
+ TEST(PS_DRIVER), TEST(AUTHORIZED),
+ TEST(SHORT_PREAMBLE),
+- TEST(WME), TEST(WDS), TEST(CLEAR_PS_FILT),
++ TEST(WME), TEST(CLEAR_PS_FILT),
+ TEST(MFP), TEST(BLOCK_BA), TEST(PSPOLL),
+ TEST(UAPSD), TEST(SP), TEST(TDLS_PEER),
+ TEST(TDLS_PEER_AUTH), TEST(4ADDR_EVENT),
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -178,7 +178,6 @@ static int ieee80211_do_open(struct net_
u32 changed = 0;
int res;
u32 hw_reconf_flags = 0;
-@@ -290,27 +289,6 @@ static int ieee80211_do_open(struct net_
+@@ -309,28 +308,6 @@ static int ieee80211_do_open(struct net_
set_bit(SDATA_STATE_RUNNING, &sdata->state);
- goto err_del_interface;
- }
-
-- /* no locking required since STA is not live yet */
-- sta->flags |= WLAN_STA_AUTHORIZED;
+- sta_info_pre_move_state(sta, IEEE80211_STA_AUTH);
+- sta_info_pre_move_state(sta, IEEE80211_STA_ASSOC);
+- sta_info_pre_move_state(sta, IEEE80211_STA_AUTHORIZED);
-
- res = sta_info_insert(sta);
- if (res) {
/*
* set_multicast_list will be invoked by the networking core
* which will check whether any increments here were done in
-@@ -344,8 +322,7 @@ static int ieee80211_do_open(struct net_
+@@ -357,8 +334,7 @@ static int ieee80211_do_open(struct net_
netif_tx_start_all_queues(dev);
return 0;
- err_del_interface:
-- drv_remove_interface(local, &sdata->vif);
+- drv_remove_interface(local, sdata);
+
err_stop:
if (!local->open_count)
drv_stop(local);
-@@ -718,6 +695,70 @@ static void ieee80211_if_setup(struct ne
+@@ -722,6 +698,70 @@ static void ieee80211_if_setup(struct ne
dev->destructor = free_netdev;
}
+ sta->sta.supp_rates[local->hw.conf.channel->band] = rates;
+
+ if (elems.ht_cap_elem)
-+ ieee80211_ht_cap_ie_to_sta_ht_cap(sband,
++ ieee80211_ht_cap_ie_to_sta_ht_cap(sdata, sband,
+ elems.ht_cap_elem, &sta->sta.ht_cap);
+
+ if (elems.wmm_param)
-+ set_sta_flags(sta, WLAN_STA_WME);
++ set_sta_flag(sta, WLAN_STA_WME);
+
+ if (new) {
-+ sta->flags = WLAN_STA_AUTHORIZED;
++ set_sta_flag(sta, WLAN_STA_AUTHORIZED);
+ rate_control_rate_init(sta);
+ sta_info_insert_rcu(sta);
+ }
static void ieee80211_iface_work(struct work_struct *work)
{
struct ieee80211_sub_if_data *sdata =
-@@ -822,6 +863,9 @@ static void ieee80211_iface_work(struct
+@@ -826,6 +866,9 @@ static void ieee80211_iface_work(struct
break;
ieee80211_mesh_rx_queued_mgmt(sdata, skb);
break;
break;
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
-@@ -2137,7 +2137,8 @@ ieee80211_rx_h_action(struct ieee80211_r
- */
- if (sdata->vif.type != NL80211_IFTYPE_STATION &&
+@@ -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_AP)
-+ sdata->vif.type != NL80211_IFTYPE_AP &&
-+ sdata->vif.type != NL80211_IFTYPE_WDS)
+ sdata->vif.type != NL80211_IFTYPE_AP &&
++ sdata->vif.type != NL80211_IFTYPE_WDS &&
+ sdata->vif.type != NL80211_IFTYPE_ADHOC)
break;
- /* verify action_code is present */
-@@ -2335,13 +2336,14 @@ ieee80211_rx_h_mgmt(struct ieee80211_rx_
+@@ -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) &&
sdata->vif.type != NL80211_IFTYPE_ADHOC &&
return RX_DROP_MONITOR;
switch (stype) {
+ case cpu_to_le16(IEEE80211_STYPE_AUTH):
case cpu_to_le16(IEEE80211_STYPE_BEACON):
case cpu_to_le16(IEEE80211_STYPE_PROBE_RESP):
- /* process for all: mesh, mlme, ibss */
+ /* process for all: mesh, mlme, ibss, wds */
break;
- case cpu_to_le16(IEEE80211_STYPE_DEAUTH):
- case cpu_to_le16(IEEE80211_STYPE_DISASSOC):
-@@ -2680,10 +2682,16 @@ static int prepare_for_handlers(struct i
+ case cpu_to_le16(IEEE80211_STYPE_ASSOC_RESP):
+ case cpu_to_le16(IEEE80211_STYPE_REASSOC_RESP):
+@@ -2853,10 +2855,16 @@ static int prepare_for_handlers(struct i
}
break;
case NL80211_IFTYPE_WDS:
break;
default:
/* should never get here */
+--- a/net/mac80211/sta_info.c
++++ b/net/mac80211/sta_info.c
+@@ -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.
+ */
+- info->flags |= IEEE80211_TX_CTL_POLL_RESPONSE |
++ info->flags |= IEEE80211_TX_CTL_NO_PS_BUFFER |
+ IEEE80211_TX_STATUS_EOSP |
+ IEEE80211_TX_CTL_REQ_TX_STATUS;
+
+@@ -1177,7 +1178,7 @@ ieee80211_sta_ps_deliver_response(struct
+ * STA may still remain is PS mode after this frame
+ * exchange.
+ */
+- info->flags |= IEEE80211_TX_CTL_POLL_RESPONSE;
++ info->flags |= IEEE80211_TX_CTL_NO_PS_BUFFER;
+
+ /*
+ * 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_ASSOC_AP: We're associated to that station, it is an AP.
* @WLAN_STA_WME: Station is a QoS-STA.
- * @WLAN_STA_WDS: Station is one of our WDS peers.
* @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.
-@@ -54,7 +53,6 @@ enum ieee80211_sta_info_flags {
- WLAN_STA_SHORT_PREAMBLE = 1<<4,
- WLAN_STA_ASSOC_AP = 1<<5,
- WLAN_STA_WME = 1<<6,
-- WLAN_STA_WDS = 1<<7,
- WLAN_STA_CLEAR_PS_FILT = 1<<9,
- WLAN_STA_MFP = 1<<10,
- WLAN_STA_BLOCK_BA = 1<<11,
---- a/drivers/net/wireless/ath/ath9k/beacon.c
-+++ b/drivers/net/wireless/ath/ath9k/beacon.c
-@@ -384,7 +384,9 @@ void ath_beacon_tasklet(unsigned long da
- ath_dbg(common, ATH_DBG_BSTUCK,
- "beacon is officially stuck\n");
- sc->sc_flags |= SC_OP_TSF_RESET;
-+ spin_lock(&sc->sc_pcu_lock);
- ath_reset(sc, true);
-+ spin_unlock(&sc->sc_pcu_lock);
- }
+@@ -62,7 +62,6 @@ enum ieee80211_sta_info_flags {
+ WLAN_STA_AUTHORIZED,
+ WLAN_STA_SHORT_PREAMBLE,
+ WLAN_STA_WME,
+- WLAN_STA_WDS,
+ 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)
- return;
---- a/drivers/net/wireless/ath/ath9k/main.c
-+++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -617,8 +617,11 @@ void ath_hw_check(struct work_struct *wo
- ath_dbg(common, ATH_DBG_RESET, "Possible baseband hang, "
- "busy=%d (try %d)\n", busy, sc->hw_busy_count + 1);
- if (busy >= 99) {
-- if (++sc->hw_busy_count >= 3)
-+ if (++sc->hw_busy_count >= 3) {
-+ spin_lock_bh(&sc->sc_pcu_lock);
- ath_reset(sc, true);
-+ spin_unlock_bh(&sc->sc_pcu_lock);
+ /*
+ * 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
+ struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)tx->skb->data;
+ struct ieee80211_local *local = tx->local;
+
+- if (unlikely(!sta ||
+- ieee80211_is_probe_resp(hdr->frame_control) ||
+- ieee80211_is_auth(hdr->frame_control) ||
+- ieee80211_is_assoc_resp(hdr->frame_control) ||
+- ieee80211_is_reassoc_resp(hdr->frame_control)))
++ if (unlikely(!sta))
+ return TX_CONTINUE;
+
+ if (unlikely((test_sta_flag(sta, WLAN_STA_PS_STA) ||
+ test_sta_flag(sta, WLAN_STA_PS_DRIVER)) &&
+- !(info->flags & IEEE80211_TX_CTL_POLL_RESPONSE))) {
++ !(info->flags & IEEE80211_TX_CTL_NO_PS_BUFFER))) {
+ int ac = skb_get_queue_mapping(tx->skb);
+
++ /* only deauth, disassoc and action are bufferable MMPDUs */
++ if (ieee80211_is_mgmt(hdr->frame_control) &&
++ !ieee80211_is_deauth(hdr->frame_control) &&
++ !ieee80211_is_disassoc(hdr->frame_control) &&
++ !ieee80211_is_action(hdr->frame_control)) {
++ info->flags |= IEEE80211_TX_CTL_NO_PS_BUFFER;
++ return TX_CONTINUE;
+ }
- } else if (busy >= 0)
- sc->hw_busy_count = 0;
-
-@@ -637,7 +640,9 @@ static void ath_hw_pll_rx_hang_check(str
- /* Rx is hung for more than 500ms. Reset it */
- ath_dbg(common, ATH_DBG_RESET,
- "Possible RX hang, resetting");
-+ spin_lock_bh(&sc->sc_pcu_lock);
- ath_reset(sc, true);
-+ spin_unlock_bh(&sc->sc_pcu_lock);
- count = 0;
- }
- } else
-@@ -674,7 +679,9 @@ void ath9k_tasklet(unsigned long data)
++
+ #ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG
+ printk(KERN_DEBUG "STA %pM aid %d: PS buffer for AC %d\n",
+ sta->sta.addr, sta->sta.aid, ac);
+--- a/net/mac80211/ieee80211_i.h
++++ b/net/mac80211/ieee80211_i.h
+@@ -480,7 +480,7 @@ struct ieee80211_if_ibss {
- if ((status & ATH9K_INT_FATAL) ||
- (status & ATH9K_INT_BB_WATCHDOG)) {
-+ spin_lock(&sc->sc_pcu_lock);
- ath_reset(sc, true);
-+ spin_unlock(&sc->sc_pcu_lock);
+ bool control_port;
+
+- u8 bssid[ETH_ALEN];
++ u8 bssid[ETH_ALEN] __aligned(2);
+ 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;
}
-@@ -980,7 +987,6 @@ int ath_reset(struct ath_softc *sc, bool
- del_timer_sync(&common->ani.timer);
+--- 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
- ath9k_ps_wakeup(sc);
-- spin_lock_bh(&sc->sc_pcu_lock);
+ mhwmp_dbg("received PREQ from %pM", orig_addr);
- ieee80211_stop_queues(hw);
+- 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));
-@@ -1023,7 +1029,6 @@ int ath_reset(struct ath_softc *sc, bool
+ 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;
}
- ieee80211_wake_queues(hw);
-- spin_unlock_bh(&sc->sc_pcu_lock);
-
- /* Start ANI */
- if (!common->disable_ani)
-@@ -2326,9 +2331,9 @@ static void ath9k_flush(struct ieee80211
- ath9k_ps_wakeup(sc);
- spin_lock_bh(&sc->sc_pcu_lock);
- drain_txq = ath_drain_all_txq(sc, false);
-- spin_unlock_bh(&sc->sc_pcu_lock);
- if (!drain_txq)
- ath_reset(sc, false);
-+ spin_unlock_bh(&sc->sc_pcu_lock);
- ath9k_ps_restore(sc);
- ieee80211_wake_queues(hw);
-
---- a/drivers/net/wireless/ath/ath9k/xmit.c
-+++ b/drivers/net/wireless/ath/ath9k/xmit.c
-@@ -565,11 +565,8 @@ static void ath_tx_complete_aggr(struct
-
- rcu_read_unlock();
-
-- if (needreset) {
-- spin_unlock_bh(&sc->sc_pcu_lock);
-+ if (needreset)
- ath_reset(sc, false);
-- spin_lock_bh(&sc->sc_pcu_lock);
-- }
- }
+@@ -657,7 +658,7 @@ int mpp_path_add(u8 *dst, u8 *mpp, struc
+ int err = 0;
+ u32 hash_idx;
- static u32 ath_lookup_rate(struct ath_softc *sc, struct ath_buf *bf,
-@@ -664,7 +661,8 @@ static int ath_compute_num_delims(struct
- * TODO - this could be improved to be dependent on the rate.
- * The hardware can keep up at lower rates, but not higher rates
- */
-- if (fi->keyix != ATH9K_TXKEYIX_INVALID)
-+ if ((fi->keyix != ATH9K_TXKEYIX_INVALID) &&
-+ !(sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA))
- ndelim += ATH_AGGR_ENCRYPTDELIM;
+- 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;
/*
-@@ -2169,7 +2167,9 @@ static void ath_tx_complete_poll_work(st
- if (needreset) {
- ath_dbg(ath9k_hw_common(sc->sc_ah), ATH_DBG_RESET,
- "tx hung, resetting the chip\n");
-+ spin_lock_bh(&sc->sc_pcu_lock);
- ath_reset(sc, true);
-+ spin_unlock_bh(&sc->sc_pcu_lock);
+@@ -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
}
- ieee80211_queue_delayed_work(sc->hw, &sc->tx_complete_work,
---- a/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
-@@ -236,7 +236,7 @@ static void ar9003_paprd_get_gain_table(
- memset(entry, 0, sizeof(ah->paprd_gain_table_entries));
- memset(index, 0, sizeof(ah->paprd_gain_table_index));
-
-- for (i = 0; i < 32; i++) {
-+ for (i = 0; i < PAPRD_GAIN_TABLE_ENTRIES; i++) {
- entry[i] = REG_READ(ah, reg);
- index[i] = (entry[i] >> 24) & 0xff;
- reg += 4;
-@@ -246,13 +246,13 @@ static void ar9003_paprd_get_gain_table(
- static unsigned int ar9003_get_desired_gain(struct ath_hw *ah, int chain,
- int target_power)
- {
-- int olpc_gain_delta = 0;
-+ int olpc_gain_delta = 0, cl_gain_mod;
- int alpha_therm, alpha_volt;
- int therm_cal_value, volt_cal_value;
- int therm_value, volt_value;
- int thermal_gain_corr, voltage_gain_corr;
- int desired_scale, desired_gain = 0;
-- u32 reg;
-+ u32 reg_olpc = 0, reg_cl_gain = 0;
-
- REG_CLR_BIT(ah, AR_PHY_PAPRD_TRAINER_STAT1,
- AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_TRAIN_DONE);
-@@ -271,15 +271,29 @@ static unsigned int ar9003_get_desired_g
- volt_value = REG_READ_FIELD(ah, AR_PHY_BB_THERM_ADC_4,
- AR_PHY_BB_THERM_ADC_4_LATEST_VOLT_VALUE);
-
-- if (chain == 0)
-- reg = AR_PHY_TPC_11_B0;
-- else if (chain == 1)
-- reg = AR_PHY_TPC_11_B1;
-- else
-- reg = AR_PHY_TPC_11_B2;
-+ switch (chain) {
-+ case 0:
-+ reg_olpc = AR_PHY_TPC_11_B0;
-+ reg_cl_gain = AR_PHY_CL_TAB_0;
-+ break;
-+ case 1:
-+ reg_olpc = AR_PHY_TPC_11_B1;
-+ reg_cl_gain = AR_PHY_CL_TAB_1;
-+ break;
-+ case 2:
-+ reg_olpc = AR_PHY_TPC_11_B2;
-+ reg_cl_gain = AR_PHY_CL_TAB_2;
-+ break;
-+ default:
-+ ath_dbg(ath9k_hw_common(ah), ATH_DBG_CALIBRATE,
-+ "Invalid chainmask: %d\n", chain);
-+ break;
-+ }
+ 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));
-- olpc_gain_delta = REG_READ_FIELD(ah, reg,
-+ olpc_gain_delta = REG_READ_FIELD(ah, reg_olpc,
- AR_PHY_TPC_11_OLPC_GAIN_DELTA);
-+ cl_gain_mod = REG_READ_FIELD(ah, reg_cl_gain,
-+ AR_PHY_CL_TAB_CL_GAIN_MOD);
-
- if (olpc_gain_delta >= 128)
- olpc_gain_delta = olpc_gain_delta - 256;
-@@ -289,7 +303,7 @@ static unsigned int ar9003_get_desired_g
- voltage_gain_corr = (alpha_volt * (volt_value - volt_cal_value) +
- (128 / 2)) / 128;
- desired_gain = target_power - olpc_gain_delta - thermal_gain_corr -
-- voltage_gain_corr + desired_scale;
-+ voltage_gain_corr + desired_scale + cl_gain_mod;
-
- return desired_gain;
+ 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);
}
-@@ -727,7 +741,7 @@ int ar9003_paprd_setup_gain_table(struct
- desired_gain = ar9003_get_desired_gain(ah, chain, train_power);
+ 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;
+ }
- gain_index = 0;
-- for (i = 0; i < 32; i++) {
-+ for (i = 0; i < PAPRD_GAIN_TABLE_ENTRIES; i++) {
- if (ah->paprd_gain_table_index[i] >= desired_gain)
+- 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;
- gain_index++;
---- a/drivers/net/wireless/ath/ath9k/ar9003_phy.h
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.h
-@@ -1121,6 +1121,9 @@
- #define AR_PHY_POWERTX_RATE8_POWERTXHT40_5 0x3F00
- #define AR_PHY_POWERTX_RATE8_POWERTXHT40_5_S 8
-
-+#define AR_PHY_CL_TAB_CL_GAIN_MOD 0x1f
-+#define AR_PHY_CL_TAB_CL_GAIN_MOD_S 0
+ 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
+
- void ar9003_hw_set_chain_masks(struct ath_hw *ah, u8 rx, u8 tx);
+ 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 /* AR9003_PHY_H */
++#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