X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/bf31710a545ddadf520ceb832b23c6f949f60d2b..b8d5619ca8ac95b4a0365a7adcce4b0d9c7305ce:/package/mac80211/patches/300-pending_work.patch?ds=sidebyside diff --git a/package/mac80211/patches/300-pending_work.patch b/package/mac80211/patches/300-pending_work.patch index d3bcece60..30ce96e17 100644 --- a/package/mac80211/patches/300-pending_work.patch +++ b/package/mac80211/patches/300-pending_work.patch @@ -1,2120 +1,242 @@ ---- a/drivers/net/wireless/ath/ath9k/ar9002_mac.c -+++ b/drivers/net/wireless/ath/ath9k/ar9002_mac.c -@@ -170,33 +170,104 @@ static bool ar9002_hw_get_isr(struct ath - return true; - } - --static void ar9002_hw_fill_txdesc(struct ath_hw *ah, void *ds, u32 seglen, -- bool is_firstseg, bool is_lastseg, -- const void *ds0, dma_addr_t buf_addr, -- unsigned int qcu) -+static void -+ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i) - { - struct ar5416_desc *ads = AR5416DESC(ds); -+ u32 ctl1, ctl6; - -- ads->ds_data = buf_addr; -- -- if (is_firstseg) { -- ads->ds_ctl1 |= seglen | (is_lastseg ? 0 : AR_TxMore); -- } else if (is_lastseg) { -- ads->ds_ctl0 = 0; -- ads->ds_ctl1 = seglen; -- ads->ds_ctl2 = AR5416DESC_CONST(ds0)->ds_ctl2; -- ads->ds_ctl3 = AR5416DESC_CONST(ds0)->ds_ctl3; -- } else { -- ads->ds_ctl0 = 0; -- ads->ds_ctl1 = seglen | AR_TxMore; -- ads->ds_ctl2 = 0; -- ads->ds_ctl3 = 0; -- } - ads->ds_txstatus0 = ads->ds_txstatus1 = 0; - ads->ds_txstatus2 = ads->ds_txstatus3 = 0; - ads->ds_txstatus4 = ads->ds_txstatus5 = 0; - ads->ds_txstatus6 = ads->ds_txstatus7 = 0; - ads->ds_txstatus8 = ads->ds_txstatus9 = 0; -+ -+ ACCESS_ONCE(ads->ds_link) = i->link; -+ ACCESS_ONCE(ads->ds_data) = i->buf_addr[0]; -+ -+ ctl1 = i->buf_len[0] | (i->is_last ? 0 : AR_TxMore); -+ ctl6 = SM(i->keytype, AR_EncrType); -+ -+ if (AR_SREV_9285(ah)) { -+ ads->ds_ctl8 = 0; -+ ads->ds_ctl9 = 0; -+ ads->ds_ctl10 = 0; -+ ads->ds_ctl11 = 0; -+ } -+ -+ if ((i->is_first || i->is_last) && -+ i->aggr != AGGR_BUF_MIDDLE && i->aggr != AGGR_BUF_LAST) { -+ ACCESS_ONCE(ads->ds_ctl2) = set11nTries(i->rates, 0) -+ | set11nTries(i->rates, 1) -+ | set11nTries(i->rates, 2) -+ | set11nTries(i->rates, 3) -+ | (i->dur_update ? AR_DurUpdateEna : 0) -+ | SM(0, AR_BurstDur); -+ -+ ACCESS_ONCE(ads->ds_ctl3) = set11nRate(i->rates, 0) -+ | set11nRate(i->rates, 1) -+ | set11nRate(i->rates, 2) -+ | set11nRate(i->rates, 3); -+ } else { -+ ACCESS_ONCE(ads->ds_ctl2) = 0; -+ ACCESS_ONCE(ads->ds_ctl3) = 0; -+ } -+ -+ if (!i->is_first) { -+ ACCESS_ONCE(ads->ds_ctl0) = 0; -+ ACCESS_ONCE(ads->ds_ctl1) = ctl1; -+ ACCESS_ONCE(ads->ds_ctl6) = ctl6; -+ return; -+ } -+ -+ ctl1 |= (i->keyix != ATH9K_TXKEYIX_INVALID ? SM(i->keyix, AR_DestIdx) : 0) -+ | SM(i->type, AR_FrameType) -+ | (i->flags & ATH9K_TXDESC_NOACK ? AR_NoAck : 0) -+ | (i->flags & ATH9K_TXDESC_EXT_ONLY ? AR_ExtOnly : 0) -+ | (i->flags & ATH9K_TXDESC_EXT_AND_CTL ? AR_ExtAndCtl : 0); -+ -+ switch (i->aggr) { -+ case AGGR_BUF_FIRST: -+ ctl6 |= SM(i->aggr_len, AR_AggrLen); -+ /* fall through */ -+ case AGGR_BUF_MIDDLE: -+ ctl1 |= AR_IsAggr | AR_MoreAggr; -+ ctl6 |= SM(i->ndelim, AR_PadDelim); -+ break; -+ case AGGR_BUF_LAST: -+ ctl1 |= AR_IsAggr; -+ break; -+ case AGGR_BUF_NONE: -+ break; -+ } -+ -+ ACCESS_ONCE(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen) -+ | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0) -+ | SM(i->txpower, AR_XmitPower) -+ | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0) -+ | (i->flags & ATH9K_TXDESC_INTREQ ? AR_TxIntrReq : 0) -+ | (i->keyix != ATH9K_TXKEYIX_INVALID ? AR_DestIdxValid : 0) -+ | (i->flags & ATH9K_TXDESC_CLRDMASK ? AR_ClrDestMask : 0) -+ | (i->flags & ATH9K_TXDESC_RTSENA ? AR_RTSEnable : -+ (i->flags & ATH9K_TXDESC_CTSENA ? AR_CTSEnable : 0)); -+ -+ ACCESS_ONCE(ads->ds_ctl1) = ctl1; -+ ACCESS_ONCE(ads->ds_ctl6) = ctl6; -+ -+ if (i->aggr == AGGR_BUF_MIDDLE || i->aggr == AGGR_BUF_LAST) -+ return; -+ -+ ACCESS_ONCE(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0) -+ | set11nPktDurRTSCTS(i->rates, 1); -+ -+ ACCESS_ONCE(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2) -+ | set11nPktDurRTSCTS(i->rates, 3); -+ -+ ACCESS_ONCE(ads->ds_ctl7) = set11nRateFlags(i->rates, 0) -+ | set11nRateFlags(i->rates, 1) -+ | set11nRateFlags(i->rates, 2) -+ | set11nRateFlags(i->rates, 3) -+ | SM(i->rtscts_rate, AR_RTSCTSRate); - } - - static int ar9002_hw_proc_txdesc(struct ath_hw *ah, void *ds, -@@ -271,145 +342,6 @@ static int ar9002_hw_proc_txdesc(struct - return 0; - } - --static void ar9002_hw_set11n_txdesc(struct ath_hw *ah, void *ds, -- u32 pktLen, enum ath9k_pkt_type type, -- u32 txPower, u8 keyIx, -- enum ath9k_key_type keyType, u32 flags) --{ -- struct ar5416_desc *ads = AR5416DESC(ds); -- -- if (txPower > 63) -- txPower = 63; -- -- ads->ds_ctl0 = (pktLen & AR_FrameLen) -- | (flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0) -- | SM(txPower, AR_XmitPower) -- | (flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0) -- | (flags & ATH9K_TXDESC_INTREQ ? AR_TxIntrReq : 0) -- | (keyIx != ATH9K_TXKEYIX_INVALID ? AR_DestIdxValid : 0); -- -- ads->ds_ctl1 = -- (keyIx != ATH9K_TXKEYIX_INVALID ? SM(keyIx, AR_DestIdx) : 0) -- | SM(type, AR_FrameType) -- | (flags & ATH9K_TXDESC_NOACK ? AR_NoAck : 0) -- | (flags & ATH9K_TXDESC_EXT_ONLY ? AR_ExtOnly : 0) -- | (flags & ATH9K_TXDESC_EXT_AND_CTL ? AR_ExtAndCtl : 0); -- -- ads->ds_ctl6 = SM(keyType, AR_EncrType); -- -- if (AR_SREV_9285(ah) || AR_SREV_9271(ah)) { -- ads->ds_ctl8 = 0; -- ads->ds_ctl9 = 0; -- ads->ds_ctl10 = 0; -- ads->ds_ctl11 = 0; -- } --} -- --static void ar9002_hw_set_clrdmask(struct ath_hw *ah, void *ds, bool val) --{ -- struct ar5416_desc *ads = AR5416DESC(ds); -- -- if (val) -- ads->ds_ctl0 |= AR_ClrDestMask; -- else -- ads->ds_ctl0 &= ~AR_ClrDestMask; --} -- --static void ar9002_hw_set11n_ratescenario(struct ath_hw *ah, void *ds, -- void *lastds, -- u32 durUpdateEn, u32 rtsctsRate, -- u32 rtsctsDuration, -- struct ath9k_11n_rate_series series[], -- u32 nseries, u32 flags) --{ -- struct ar5416_desc *ads = AR5416DESC(ds); -- struct ar5416_desc *last_ads = AR5416DESC(lastds); -- u32 ds_ctl0; -- -- if (flags & (ATH9K_TXDESC_RTSENA | ATH9K_TXDESC_CTSENA)) { -- ds_ctl0 = ads->ds_ctl0; -- -- if (flags & ATH9K_TXDESC_RTSENA) { -- ds_ctl0 &= ~AR_CTSEnable; -- ds_ctl0 |= AR_RTSEnable; -- } else { -- ds_ctl0 &= ~AR_RTSEnable; -- ds_ctl0 |= AR_CTSEnable; -- } -- -- ads->ds_ctl0 = ds_ctl0; -- } else { -- ads->ds_ctl0 = -- (ads->ds_ctl0 & ~(AR_RTSEnable | AR_CTSEnable)); -- } -- -- ads->ds_ctl2 = set11nTries(series, 0) -- | set11nTries(series, 1) -- | set11nTries(series, 2) -- | set11nTries(series, 3) -- | (durUpdateEn ? AR_DurUpdateEna : 0) -- | SM(0, AR_BurstDur); -- -- ads->ds_ctl3 = set11nRate(series, 0) -- | set11nRate(series, 1) -- | set11nRate(series, 2) -- | set11nRate(series, 3); -- -- ads->ds_ctl4 = set11nPktDurRTSCTS(series, 0) -- | set11nPktDurRTSCTS(series, 1); -- -- ads->ds_ctl5 = set11nPktDurRTSCTS(series, 2) -- | set11nPktDurRTSCTS(series, 3); -- -- ads->ds_ctl7 = set11nRateFlags(series, 0) -- | set11nRateFlags(series, 1) -- | set11nRateFlags(series, 2) -- | set11nRateFlags(series, 3) -- | SM(rtsctsRate, AR_RTSCTSRate); -- last_ads->ds_ctl2 = ads->ds_ctl2; -- last_ads->ds_ctl3 = ads->ds_ctl3; --} -- --static void ar9002_hw_set11n_aggr_first(struct ath_hw *ah, void *ds, -- u32 aggrLen) --{ -- struct ar5416_desc *ads = AR5416DESC(ds); -- -- ads->ds_ctl1 |= (AR_IsAggr | AR_MoreAggr); -- ads->ds_ctl6 &= ~AR_AggrLen; -- ads->ds_ctl6 |= SM(aggrLen, AR_AggrLen); --} -- --static void ar9002_hw_set11n_aggr_middle(struct ath_hw *ah, void *ds, -- u32 numDelims) --{ -- struct ar5416_desc *ads = AR5416DESC(ds); -- unsigned int ctl6; -- -- ads->ds_ctl1 |= (AR_IsAggr | AR_MoreAggr); -- -- ctl6 = ads->ds_ctl6; -- ctl6 &= ~AR_PadDelim; -- ctl6 |= SM(numDelims, AR_PadDelim); -- ads->ds_ctl6 = ctl6; --} -- --static void ar9002_hw_set11n_aggr_last(struct ath_hw *ah, void *ds) --{ -- struct ar5416_desc *ads = AR5416DESC(ds); -- -- ads->ds_ctl1 |= AR_IsAggr; -- ads->ds_ctl1 &= ~AR_MoreAggr; -- ads->ds_ctl6 &= ~AR_PadDelim; --} -- --static void ar9002_hw_clr11n_aggr(struct ath_hw *ah, void *ds) --{ -- struct ar5416_desc *ads = AR5416DESC(ds); -- -- ads->ds_ctl1 &= (~AR_IsAggr & ~AR_MoreAggr); --} -- - void ath9k_hw_setuprxdesc(struct ath_hw *ah, struct ath_desc *ds, - u32 size, u32 flags) - { -@@ -433,13 +365,6 @@ void ar9002_hw_attach_mac_ops(struct ath - ops->rx_enable = ar9002_hw_rx_enable; - ops->set_desc_link = ar9002_hw_set_desc_link; - ops->get_isr = ar9002_hw_get_isr; -- ops->fill_txdesc = ar9002_hw_fill_txdesc; -+ ops->set_txdesc = ar9002_set_txdesc; - ops->proc_txdesc = ar9002_hw_proc_txdesc; -- ops->set11n_txdesc = ar9002_hw_set11n_txdesc; -- ops->set11n_ratescenario = ar9002_hw_set11n_ratescenario; -- ops->set11n_aggr_first = ar9002_hw_set11n_aggr_first; -- ops->set11n_aggr_middle = ar9002_hw_set11n_aggr_middle; -- ops->set11n_aggr_last = ar9002_hw_set11n_aggr_last; -- ops->clr11n_aggr = ar9002_hw_clr11n_aggr; -- ops->set_clrdmask = ar9002_hw_set_clrdmask; - } ---- a/drivers/net/wireless/ath/ath9k/ar9003_calib.c -+++ b/drivers/net/wireless/ath/ath9k/ar9003_calib.c -@@ -652,8 +652,9 @@ static void ar9003_hw_detect_outlier(int - outlier_idx = max_idx; - else - outlier_idx = min_idx; -+ -+ mp_coeff[outlier_idx] = mp_avg; - } -- mp_coeff[outlier_idx] = mp_avg; - } - - static void ar9003_hw_tx_iqcal_load_avg_2_passes(struct ath_hw *ah, -@@ -884,6 +885,7 @@ static bool ar9003_hw_init_cal(struct at - if (txiqcal_done) - ar9003_hw_tx_iq_cal_post_proc(ah); - -+ ath9k_hw_loadnf(ah, chan); - ath9k_hw_start_nfcal(ah, true); - - /* Initialize list pointers */ ---- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c -+++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c -@@ -21,6 +21,132 @@ static void ar9003_hw_rx_enable(struct a - REG_WRITE(hw, AR_CR, 0); - } - -+static void -+ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i) -+{ -+ struct ar9003_txc *ads = ds; -+ int checksum = 0; -+ u32 val, ctl12, ctl17; -+ -+ val = (ATHEROS_VENDOR_ID << AR_DescId_S) | -+ (1 << AR_TxRxDesc_S) | -+ (1 << AR_CtrlStat_S) | -+ (i->qcu << AR_TxQcuNum_S) | 0x17; -+ -+ checksum += val; -+ ACCESS_ONCE(ads->info) = val; -+ -+ checksum += i->link; -+ ACCESS_ONCE(ads->link) = i->link; -+ -+ checksum += i->buf_addr[0]; -+ ACCESS_ONCE(ads->data0) = i->buf_addr[0]; -+ checksum += i->buf_addr[1]; -+ ACCESS_ONCE(ads->data1) = i->buf_addr[1]; -+ checksum += i->buf_addr[2]; -+ ACCESS_ONCE(ads->data2) = i->buf_addr[2]; -+ checksum += i->buf_addr[3]; -+ ACCESS_ONCE(ads->data3) = i->buf_addr[3]; -+ -+ checksum += (val = (i->buf_len[0] << AR_BufLen_S) & AR_BufLen); -+ ACCESS_ONCE(ads->ctl3) = val; -+ checksum += (val = (i->buf_len[1] << AR_BufLen_S) & AR_BufLen); -+ ACCESS_ONCE(ads->ctl5) = val; -+ checksum += (val = (i->buf_len[2] << AR_BufLen_S) & AR_BufLen); -+ ACCESS_ONCE(ads->ctl7) = val; -+ checksum += (val = (i->buf_len[3] << AR_BufLen_S) & AR_BufLen); -+ ACCESS_ONCE(ads->ctl9) = val; -+ -+ checksum = (u16) (((checksum & 0xffff) + (checksum >> 16)) & 0xffff); -+ ACCESS_ONCE(ads->ctl10) = checksum; -+ -+ if (i->is_first || i->is_last) { -+ ACCESS_ONCE(ads->ctl13) = set11nTries(i->rates, 0) -+ | set11nTries(i->rates, 1) -+ | set11nTries(i->rates, 2) -+ | set11nTries(i->rates, 3) -+ | (i->dur_update ? AR_DurUpdateEna : 0) -+ | SM(0, AR_BurstDur); -+ -+ ACCESS_ONCE(ads->ctl14) = set11nRate(i->rates, 0) -+ | set11nRate(i->rates, 1) -+ | set11nRate(i->rates, 2) -+ | set11nRate(i->rates, 3); -+ } else { -+ ACCESS_ONCE(ads->ctl13) = 0; -+ ACCESS_ONCE(ads->ctl14) = 0; -+ } -+ -+ ads->ctl20 = 0; -+ ads->ctl21 = 0; -+ ads->ctl22 = 0; -+ -+ ctl17 = SM(i->keytype, AR_EncrType); -+ if (!i->is_first) { -+ ACCESS_ONCE(ads->ctl11) = 0; -+ ACCESS_ONCE(ads->ctl12) = i->is_last ? 0 : AR_TxMore; -+ ACCESS_ONCE(ads->ctl15) = 0; -+ ACCESS_ONCE(ads->ctl16) = 0; -+ ACCESS_ONCE(ads->ctl17) = ctl17; -+ ACCESS_ONCE(ads->ctl18) = 0; -+ ACCESS_ONCE(ads->ctl19) = 0; -+ return; -+ } -+ -+ ACCESS_ONCE(ads->ctl11) = (i->pkt_len & AR_FrameLen) -+ | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0) -+ | SM(i->txpower, AR_XmitPower) -+ | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0) -+ | (i->keyix != ATH9K_TXKEYIX_INVALID ? AR_DestIdxValid : 0) -+ | (i->flags & ATH9K_TXDESC_LOWRXCHAIN ? AR_LowRxChain : 0) -+ | (i->flags & ATH9K_TXDESC_CLRDMASK ? AR_ClrDestMask : 0) -+ | (i->flags & ATH9K_TXDESC_RTSENA ? AR_RTSEnable : -+ (i->flags & ATH9K_TXDESC_CTSENA ? AR_CTSEnable : 0)); -+ -+ ctl12 = (i->keyix != ATH9K_TXKEYIX_INVALID ? -+ SM(i->keyix, AR_DestIdx) : 0) -+ | SM(i->type, AR_FrameType) -+ | (i->flags & ATH9K_TXDESC_NOACK ? AR_NoAck : 0) -+ | (i->flags & ATH9K_TXDESC_EXT_ONLY ? AR_ExtOnly : 0) -+ | (i->flags & ATH9K_TXDESC_EXT_AND_CTL ? AR_ExtAndCtl : 0); -+ -+ ctl17 |= (i->flags & ATH9K_TXDESC_LDPC ? AR_LDPC : 0); -+ switch (i->aggr) { -+ case AGGR_BUF_FIRST: -+ ctl17 |= SM(i->aggr_len, AR_AggrLen); -+ /* fall through */ -+ case AGGR_BUF_MIDDLE: -+ ctl12 |= AR_IsAggr | AR_MoreAggr; -+ ctl17 |= SM(i->ndelim, AR_PadDelim); -+ break; -+ case AGGR_BUF_LAST: -+ ctl12 |= AR_IsAggr; -+ break; -+ case AGGR_BUF_NONE: -+ break; -+ } -+ -+ val = (i->flags & ATH9K_TXDESC_PAPRD) >> ATH9K_TXDESC_PAPRD_S; -+ ctl12 |= SM(val, AR_PAPRDChainMask); -+ -+ ACCESS_ONCE(ads->ctl12) = ctl12; -+ ACCESS_ONCE(ads->ctl17) = ctl17; -+ -+ ACCESS_ONCE(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0) -+ | set11nPktDurRTSCTS(i->rates, 1); -+ -+ ACCESS_ONCE(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2) -+ | set11nPktDurRTSCTS(i->rates, 3); -+ -+ ACCESS_ONCE(ads->ctl18) = set11nRateFlags(i->rates, 0) -+ | set11nRateFlags(i->rates, 1) -+ | set11nRateFlags(i->rates, 2) -+ | set11nRateFlags(i->rates, 3) -+ | SM(i->rtscts_rate, AR_RTSCTSRate); -+ -+ ACCESS_ONCE(ads->ctl19) = AR_Not_Sounding; -+} -+ - static u16 ar9003_calc_ptr_chksum(struct ar9003_txc *ads) - { - int checksum; -@@ -185,47 +311,6 @@ static bool ar9003_hw_get_isr(struct ath - return true; - } - --static void ar9003_hw_fill_txdesc(struct ath_hw *ah, void *ds, u32 seglen, -- bool is_firstseg, bool is_lastseg, -- const void *ds0, dma_addr_t buf_addr, -- unsigned int qcu) --{ -- struct ar9003_txc *ads = (struct ar9003_txc *) ds; -- unsigned int descid = 0; -- -- ads->info = (ATHEROS_VENDOR_ID << AR_DescId_S) | -- (1 << AR_TxRxDesc_S) | -- (1 << AR_CtrlStat_S) | -- (qcu << AR_TxQcuNum_S) | 0x17; -- -- ads->data0 = buf_addr; -- ads->data1 = 0; -- ads->data2 = 0; -- ads->data3 = 0; -- -- ads->ctl3 = (seglen << AR_BufLen_S); -- ads->ctl3 &= AR_BufLen; -- -- /* Fill in pointer checksum and descriptor id */ -- ads->ctl10 = ar9003_calc_ptr_chksum(ads); -- ads->ctl10 |= (descid << AR_TxDescId_S); -- -- if (is_firstseg) { -- ads->ctl12 |= (is_lastseg ? 0 : AR_TxMore); -- } else if (is_lastseg) { -- ads->ctl11 = 0; -- ads->ctl12 = 0; -- ads->ctl13 = AR9003TXC_CONST(ds0)->ctl13; -- ads->ctl14 = AR9003TXC_CONST(ds0)->ctl14; -- } else { -- /* XXX Intermediate descriptor in a multi-descriptor frame.*/ -- ads->ctl11 = 0; -- ads->ctl12 = AR_TxMore; -- ads->ctl13 = 0; -- ads->ctl14 = 0; -- } --} -- - static int ar9003_hw_proc_txdesc(struct ath_hw *ah, void *ds, - struct ath_tx_status *ts) - { -@@ -310,161 +395,6 @@ static int ar9003_hw_proc_txdesc(struct - return 0; - } - --static void ar9003_hw_set11n_txdesc(struct ath_hw *ah, void *ds, -- u32 pktlen, enum ath9k_pkt_type type, u32 txpower, -- u8 keyIx, enum ath9k_key_type keyType, u32 flags) --{ -- struct ar9003_txc *ads = (struct ar9003_txc *) ds; -- -- if (txpower > ah->txpower_limit) -- txpower = ah->txpower_limit; -- -- if (txpower > 63) -- txpower = 63; -- -- ads->ctl11 = (pktlen & AR_FrameLen) -- | (flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0) -- | SM(txpower, AR_XmitPower) -- | (flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0) -- | (keyIx != ATH9K_TXKEYIX_INVALID ? AR_DestIdxValid : 0) -- | (flags & ATH9K_TXDESC_LOWRXCHAIN ? AR_LowRxChain : 0); -- -- ads->ctl12 = -- (keyIx != ATH9K_TXKEYIX_INVALID ? SM(keyIx, AR_DestIdx) : 0) -- | SM(type, AR_FrameType) -- | (flags & ATH9K_TXDESC_NOACK ? AR_NoAck : 0) -- | (flags & ATH9K_TXDESC_EXT_ONLY ? AR_ExtOnly : 0) -- | (flags & ATH9K_TXDESC_EXT_AND_CTL ? AR_ExtAndCtl : 0); -- -- ads->ctl17 = SM(keyType, AR_EncrType) | -- (flags & ATH9K_TXDESC_LDPC ? AR_LDPC : 0); -- ads->ctl18 = 0; -- ads->ctl19 = AR_Not_Sounding; -- -- ads->ctl20 = 0; -- ads->ctl21 = 0; -- ads->ctl22 = 0; --} -- --static void ar9003_hw_set_clrdmask(struct ath_hw *ah, void *ds, bool val) --{ -- struct ar9003_txc *ads = (struct ar9003_txc *) ds; -- -- if (val) -- ads->ctl11 |= AR_ClrDestMask; -- else -- ads->ctl11 &= ~AR_ClrDestMask; --} -- --static void ar9003_hw_set11n_ratescenario(struct ath_hw *ah, void *ds, -- void *lastds, -- u32 durUpdateEn, u32 rtsctsRate, -- u32 rtsctsDuration, -- struct ath9k_11n_rate_series series[], -- u32 nseries, u32 flags) --{ -- struct ar9003_txc *ads = (struct ar9003_txc *) ds; -- struct ar9003_txc *last_ads = (struct ar9003_txc *) lastds; -- u_int32_t ctl11; -- -- if (flags & (ATH9K_TXDESC_RTSENA | ATH9K_TXDESC_CTSENA)) { -- ctl11 = ads->ctl11; -- -- if (flags & ATH9K_TXDESC_RTSENA) { -- ctl11 &= ~AR_CTSEnable; -- ctl11 |= AR_RTSEnable; -- } else { -- ctl11 &= ~AR_RTSEnable; -- ctl11 |= AR_CTSEnable; -- } -- -- ads->ctl11 = ctl11; -- } else { -- ads->ctl11 = (ads->ctl11 & ~(AR_RTSEnable | AR_CTSEnable)); -- } -- -- ads->ctl13 = set11nTries(series, 0) -- | set11nTries(series, 1) -- | set11nTries(series, 2) -- | set11nTries(series, 3) -- | (durUpdateEn ? AR_DurUpdateEna : 0) -- | SM(0, AR_BurstDur); -- -- ads->ctl14 = set11nRate(series, 0) -- | set11nRate(series, 1) -- | set11nRate(series, 2) -- | set11nRate(series, 3); -- -- ads->ctl15 = set11nPktDurRTSCTS(series, 0) -- | set11nPktDurRTSCTS(series, 1); -- -- ads->ctl16 = set11nPktDurRTSCTS(series, 2) -- | set11nPktDurRTSCTS(series, 3); -- -- ads->ctl18 = set11nRateFlags(series, 0) -- | set11nRateFlags(series, 1) -- | set11nRateFlags(series, 2) -- | set11nRateFlags(series, 3) -- | SM(rtsctsRate, AR_RTSCTSRate); -- ads->ctl19 = AR_Not_Sounding; -- -- last_ads->ctl13 = ads->ctl13; -- last_ads->ctl14 = ads->ctl14; --} -- --static void ar9003_hw_set11n_aggr_first(struct ath_hw *ah, void *ds, -- u32 aggrLen) --{ -- struct ar9003_txc *ads = (struct ar9003_txc *) ds; -- -- ads->ctl12 |= (AR_IsAggr | AR_MoreAggr); -- -- ads->ctl17 &= ~AR_AggrLen; -- ads->ctl17 |= SM(aggrLen, AR_AggrLen); --} -- --static void ar9003_hw_set11n_aggr_middle(struct ath_hw *ah, void *ds, -- u32 numDelims) --{ -- struct ar9003_txc *ads = (struct ar9003_txc *) ds; -- unsigned int ctl17; -- -- ads->ctl12 |= (AR_IsAggr | AR_MoreAggr); -- -- /* -- * We use a stack variable to manipulate ctl6 to reduce uncached -- * read modify, modfiy, write. -- */ -- ctl17 = ads->ctl17; -- ctl17 &= ~AR_PadDelim; -- ctl17 |= SM(numDelims, AR_PadDelim); -- ads->ctl17 = ctl17; --} -- --static void ar9003_hw_set11n_aggr_last(struct ath_hw *ah, void *ds) --{ -- struct ar9003_txc *ads = (struct ar9003_txc *) ds; -- -- ads->ctl12 |= AR_IsAggr; -- ads->ctl12 &= ~AR_MoreAggr; -- ads->ctl17 &= ~AR_PadDelim; --} -- --static void ar9003_hw_clr11n_aggr(struct ath_hw *ah, void *ds) --{ -- struct ar9003_txc *ads = (struct ar9003_txc *) ds; -- -- ads->ctl12 &= (~AR_IsAggr & ~AR_MoreAggr); --} -- --void ar9003_hw_set_paprd_txdesc(struct ath_hw *ah, void *ds, u8 chains) --{ -- struct ar9003_txc *ads = ds; -- -- ads->ctl12 |= SM(chains, AR_PAPRDChainMask); --} --EXPORT_SYMBOL(ar9003_hw_set_paprd_txdesc); -- - void ar9003_hw_attach_mac_ops(struct ath_hw *hw) - { - struct ath_hw_ops *ops = ath9k_hw_ops(hw); -@@ -472,15 +402,8 @@ void ar9003_hw_attach_mac_ops(struct ath - ops->rx_enable = ar9003_hw_rx_enable; - ops->set_desc_link = ar9003_hw_set_desc_link; - ops->get_isr = ar9003_hw_get_isr; -- ops->fill_txdesc = ar9003_hw_fill_txdesc; -+ ops->set_txdesc = ar9003_set_txdesc; - ops->proc_txdesc = ar9003_hw_proc_txdesc; -- ops->set11n_txdesc = ar9003_hw_set11n_txdesc; -- ops->set11n_ratescenario = ar9003_hw_set11n_ratescenario; -- ops->set11n_aggr_first = ar9003_hw_set11n_aggr_first; -- ops->set11n_aggr_middle = ar9003_hw_set11n_aggr_middle; -- ops->set11n_aggr_last = ar9003_hw_set11n_aggr_last; -- ops->clr11n_aggr = ar9003_hw_clr11n_aggr; -- ops->set_clrdmask = ar9003_hw_set_clrdmask; - } - - void ath9k_hw_set_rx_bufsize(struct ath_hw *ah, u16 buf_size) ---- a/drivers/net/wireless/ath/ath9k/ath9k.h -+++ b/drivers/net/wireless/ath/ath9k/ath9k.h -@@ -87,17 +87,14 @@ struct ath_config { - * @BUF_AMPDU: This buffer is an ampdu, as part of an aggregate (during TX) - * @BUF_AGGR: Indicates whether the buffer can be aggregated - * (used in aggregation scheduling) -- * @BUF_XRETRY: To denote excessive retries of the buffer - */ - enum buffer_type { - BUF_AMPDU = BIT(0), - BUF_AGGR = BIT(1), -- BUF_XRETRY = BIT(2), - }; - - #define bf_isampdu(bf) (bf->bf_state.bf_type & BUF_AMPDU) - #define bf_isaggr(bf) (bf->bf_state.bf_type & BUF_AGGR) --#define bf_isxretried(bf) (bf->bf_state.bf_type & BUF_XRETRY) - - #define ATH_TXSTATUS_RING_SIZE 64 - -@@ -216,6 +213,7 @@ struct ath_frame_info { - struct ath_buf_state { - u8 bf_type; - u8 bfs_paprd; -+ u8 ndelim; - u16 seqno; - unsigned long bfs_paprd_timestamp; - }; -@@ -230,7 +228,6 @@ struct ath_buf { - dma_addr_t bf_daddr; /* physical addr of desc */ - dma_addr_t bf_buf_addr; /* physical addr of data buffer, for DMA */ - bool bf_stale; -- u16 bf_flags; - struct ath_buf_state bf_state; - }; - -@@ -277,8 +274,7 @@ struct ath_tx_control { - }; - - #define ATH_TX_ERROR 0x01 --#define ATH_TX_XRETRY 0x02 --#define ATH_TX_BAR 0x04 -+#define ATH_TX_BAR 0x02 - - /** - * @txq_map: Index is mac80211 queue number. This is ---- a/drivers/net/wireless/ath/ath9k/beacon.c -+++ b/drivers/net/wireless/ath/ath9k/beacon.c -@@ -73,44 +73,39 @@ static void ath_beacon_setup(struct ath_ - struct sk_buff *skb = bf->bf_mpdu; - struct ath_hw *ah = sc->sc_ah; - struct ath_common *common = ath9k_hw_common(ah); -- struct ath_desc *ds; -- struct ath9k_11n_rate_series series[4]; -- int flags, ctsrate = 0, ctsduration = 0; -+ struct ath_tx_info info; - struct ieee80211_supported_band *sband; -+ u8 chainmask = ah->txchainmask; - u8 rate = 0; - - ath9k_reset_beacon_status(sc); - -- ds = bf->bf_desc; -- flags = ATH9K_TXDESC_NOACK; -- -- ds->ds_link = 0; -- - sband = &sc->sbands[common->hw->conf.channel->band]; - rate = sband->bitrates[rateidx].hw_value; - if (sc->sc_flags & SC_OP_PREAMBLE_SHORT) - rate |= sband->bitrates[rateidx].hw_value_short; - -- ath9k_hw_set11n_txdesc(ah, ds, skb->len + FCS_LEN, -- ATH9K_PKT_TYPE_BEACON, -- MAX_RATE_POWER, -- ATH9K_TXKEYIX_INVALID, -- ATH9K_KEY_TYPE_CLEAR, -- flags); -- -- /* NB: beacon's BufLen must be a multiple of 4 bytes */ -- ath9k_hw_filltxdesc(ah, ds, roundup(skb->len, 4), -- true, true, ds, bf->bf_buf_addr, -- sc->beacon.beaconq); -- -- memset(series, 0, sizeof(struct ath9k_11n_rate_series) * 4); -- series[0].Tries = 1; -- series[0].Rate = rate; -- series[0].ChSel = ath_txchainmask_reduction(sc, -- ah->txchainmask, series[0].Rate); -- series[0].RateFlags = (ctsrate) ? ATH9K_RATESERIES_RTS_CTS : 0; -- ath9k_hw_set11n_ratescenario(ah, ds, ds, 0, ctsrate, ctsduration, -- series, 4, 0); -+ memset(&info, 0, sizeof(info)); -+ info.pkt_len = skb->len + FCS_LEN; -+ info.type = ATH9K_PKT_TYPE_BEACON; -+ info.txpower = MAX_RATE_POWER; -+ info.keyix = ATH9K_TXKEYIX_INVALID; -+ info.keytype = ATH9K_KEY_TYPE_CLEAR; -+ info.flags = ATH9K_TXDESC_NOACK; -+ -+ info.buf_addr[0] = bf->bf_buf_addr; -+ info.buf_len[0] = roundup(skb->len, 4); -+ -+ info.is_first = true; -+ info.is_last = true; -+ -+ info.qcu = sc->beacon.beaconq; -+ -+ info.rates[0].Tries = 1; -+ info.rates[0].Rate = rate; -+ info.rates[0].ChSel = ath_txchainmask_reduction(sc, chainmask, rate); -+ -+ ath9k_hw_set_txdesc(ah, bf->bf_desc, &info); - } - - static void ath_tx_cabq(struct ieee80211_hw *hw, struct sk_buff *skb) -@@ -517,6 +512,7 @@ static void ath_beacon_config_ap(struct - /* Set the computed AP beacon timers */ - - ath9k_hw_disable_interrupts(ah); -+ sc->sc_flags |= SC_OP_TSF_RESET; - ath9k_beacon_init(sc, nexttbtt, intval); - sc->beacon.bmisscnt = 0; - ath9k_hw_set_interrupts(ah, ah->imask); ---- a/drivers/net/wireless/ath/ath9k/debug.c -+++ b/drivers/net/wireless/ath/ath9k/debug.c -@@ -826,7 +826,8 @@ static ssize_t read_file_misc(struct fil - } - - void ath_debug_stat_tx(struct ath_softc *sc, struct ath_buf *bf, -- struct ath_tx_status *ts, struct ath_txq *txq) -+ struct ath_tx_status *ts, struct ath_txq *txq, -+ unsigned int flags) - { - #define TX_SAMP_DBG(c) (sc->debug.bb_mac_samp[sc->debug.sampidx].ts\ - [sc->debug.tsidx].c) -@@ -836,12 +837,12 @@ void ath_debug_stat_tx(struct ath_softc - sc->debug.stats.txstats[qnum].tx_bytes_all += bf->bf_mpdu->len; - - if (bf_isampdu(bf)) { -- if (bf_isxretried(bf)) -+ if (flags & ATH_TX_BAR) - TX_STAT_INC(qnum, a_xretries); - else - TX_STAT_INC(qnum, a_completed); - } else { -- if (bf_isxretried(bf)) -+ if (ts->ts_status & ATH9K_TXERR_XRETRY) - TX_STAT_INC(qnum, xretries); - else - TX_STAT_INC(qnum, completed); ---- a/drivers/net/wireless/ath/ath9k/debug.h -+++ b/drivers/net/wireless/ath/ath9k/debug.h -@@ -230,7 +230,8 @@ 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); -+ struct ath_tx_status *ts, struct ath_txq *txq, -+ unsigned int flags); - void ath_debug_stat_rx(struct ath_softc *sc, struct ath_rx_status *rs); - - #else -@@ -252,7 +253,8 @@ static inline void ath_debug_stat_interr - static inline void ath_debug_stat_tx(struct ath_softc *sc, - struct ath_buf *bf, - struct ath_tx_status *ts, -- struct ath_txq *txq) -+ struct ath_txq *txq, -+ unsigned int flags) - { - } - ---- a/drivers/net/wireless/ath/ath9k/hw-ops.h -+++ b/drivers/net/wireless/ath/ath9k/hw-ops.h -@@ -54,13 +54,10 @@ static inline bool ath9k_hw_getisr(struc - return ath9k_hw_ops(ah)->get_isr(ah, masked); - } - --static inline void ath9k_hw_filltxdesc(struct ath_hw *ah, void *ds, u32 seglen, -- bool is_firstseg, bool is_lastseg, -- const void *ds0, dma_addr_t buf_addr, -- unsigned int qcu) -+static inline void ath9k_hw_set_txdesc(struct ath_hw *ah, void *ds, -+ struct ath_tx_info *i) - { -- ath9k_hw_ops(ah)->fill_txdesc(ah, ds, seglen, is_firstseg, is_lastseg, -- ds0, buf_addr, qcu); -+ return ath9k_hw_ops(ah)->set_txdesc(ah, ds, i); - } - - static inline int ath9k_hw_txprocdesc(struct ath_hw *ah, void *ds, -@@ -69,55 +66,6 @@ static inline int ath9k_hw_txprocdesc(st - return ath9k_hw_ops(ah)->proc_txdesc(ah, ds, ts); - } - --static inline void ath9k_hw_set11n_txdesc(struct ath_hw *ah, void *ds, -- u32 pktLen, enum ath9k_pkt_type type, -- u32 txPower, u32 keyIx, -- enum ath9k_key_type keyType, -- u32 flags) --{ -- ath9k_hw_ops(ah)->set11n_txdesc(ah, ds, pktLen, type, txPower, keyIx, -- keyType, flags); --} -- --static inline void ath9k_hw_set11n_ratescenario(struct ath_hw *ah, void *ds, -- void *lastds, -- u32 durUpdateEn, u32 rtsctsRate, -- u32 rtsctsDuration, -- struct ath9k_11n_rate_series series[], -- u32 nseries, u32 flags) --{ -- ath9k_hw_ops(ah)->set11n_ratescenario(ah, ds, lastds, durUpdateEn, -- rtsctsRate, rtsctsDuration, series, -- nseries, flags); --} -- --static inline void ath9k_hw_set11n_aggr_first(struct ath_hw *ah, void *ds, -- u32 aggrLen) --{ -- ath9k_hw_ops(ah)->set11n_aggr_first(ah, ds, aggrLen); --} -- --static inline void ath9k_hw_set11n_aggr_middle(struct ath_hw *ah, void *ds, -- u32 numDelims) --{ -- ath9k_hw_ops(ah)->set11n_aggr_middle(ah, ds, numDelims); --} -- --static inline void ath9k_hw_set11n_aggr_last(struct ath_hw *ah, void *ds) --{ -- ath9k_hw_ops(ah)->set11n_aggr_last(ah, ds); --} -- --static inline void ath9k_hw_clr11n_aggr(struct ath_hw *ah, void *ds) --{ -- ath9k_hw_ops(ah)->clr11n_aggr(ah, ds); --} -- --static inline void ath9k_hw_set_clrdmask(struct ath_hw *ah, void *ds, bool val) --{ -- ath9k_hw_ops(ah)->set_clrdmask(ah, ds, val); --} -- - static inline void ath9k_hw_antdiv_comb_conf_get(struct ath_hw *ah, - struct ath_hw_antcomb_conf *antconf) - { -@@ -233,11 +181,6 @@ static inline void ath9k_hw_restore_chai - return ath9k_hw_private_ops(ah)->restore_chainmask(ah); - } - --static inline void ath9k_hw_set_diversity(struct ath_hw *ah, bool value) --{ -- return ath9k_hw_private_ops(ah)->set_diversity(ah, value); --} -- - static inline bool ath9k_hw_ani_control(struct ath_hw *ah, - enum ath9k_ani_cmd cmd, int param) - { ---- a/drivers/net/wireless/ath/ath9k/hw.c -+++ b/drivers/net/wireless/ath/ath9k/hw.c -@@ -1496,14 +1496,16 @@ int ath9k_hw_reset(struct ath_hw *ah, st - } - ah->noise = ath9k_hw_getchan_noise(ah, chan); - -+ if ((AR_SREV_9280(ah) && common->bus_ops->ath_bus_type == ATH_PCI) || -+ (AR_SREV_9300_20_OR_LATER(ah) && IS_CHAN_5GHZ(chan))) -+ bChannelChange = false; -+ - if (bChannelChange && - (ah->chip_fullsleep != true) && - (ah->curchan != NULL) && - (chan->channel != ah->curchan->channel) && - ((chan->channelFlags & CHANNEL_ALL) == -- (ah->curchan->channelFlags & CHANNEL_ALL)) && -- (!AR_SREV_9280(ah) || AR_DEVID_7010(ah))) { -- -+ (ah->curchan->channelFlags & CHANNEL_ALL))) { - if (ath9k_hw_channel_change(ah, chan)) { - ath9k_hw_loadnf(ah, ah->curchan); - ath9k_hw_start_nfcal(ah, true); ---- a/drivers/net/wireless/ath/ath9k/hw.h -+++ b/drivers/net/wireless/ath/ath9k/hw.h -@@ -583,7 +583,6 @@ struct ath_hw_private_ops { - bool (*rfbus_req)(struct ath_hw *ah); - void (*rfbus_done)(struct ath_hw *ah); - void (*restore_chainmask)(struct ath_hw *ah); -- void (*set_diversity)(struct ath_hw *ah, bool value); - u32 (*compute_pll_control)(struct ath_hw *ah, - struct ath9k_channel *chan); - bool (*ani_control)(struct ath_hw *ah, enum ath9k_ani_cmd cmd, -@@ -615,30 +614,10 @@ struct ath_hw_ops { - u8 rxchainmask, - bool longcal); - bool (*get_isr)(struct ath_hw *ah, enum ath9k_int *masked); -- void (*fill_txdesc)(struct ath_hw *ah, void *ds, u32 seglen, -- bool is_firstseg, bool is_is_lastseg, -- const void *ds0, dma_addr_t buf_addr, -- unsigned int qcu); -+ void (*set_txdesc)(struct ath_hw *ah, void *ds, -+ struct ath_tx_info *i); - int (*proc_txdesc)(struct ath_hw *ah, void *ds, - struct ath_tx_status *ts); -- void (*set11n_txdesc)(struct ath_hw *ah, void *ds, -- u32 pktLen, enum ath9k_pkt_type type, -- u32 txPower, u8 keyIx, -- enum ath9k_key_type keyType, -- u32 flags); -- void (*set11n_ratescenario)(struct ath_hw *ah, void *ds, -- void *lastds, -- u32 durUpdateEn, u32 rtsctsRate, -- u32 rtsctsDuration, -- struct ath9k_11n_rate_series series[], -- u32 nseries, u32 flags); -- void (*set11n_aggr_first)(struct ath_hw *ah, void *ds, -- u32 aggrLen); -- void (*set11n_aggr_middle)(struct ath_hw *ah, void *ds, -- u32 numDelims); -- void (*set11n_aggr_last)(struct ath_hw *ah, void *ds); -- void (*clr11n_aggr)(struct ath_hw *ah, void *ds); -- void (*set_clrdmask)(struct ath_hw *ah, void *ds, bool val); - void (*antdiv_comb_conf_get)(struct ath_hw *ah, - struct ath_hw_antcomb_conf *antconf); - void (*antdiv_comb_conf_set)(struct ath_hw *ah, ---- a/drivers/net/wireless/ath/ath9k/mac.c -+++ b/drivers/net/wireless/ath/ath9k/mac.c -@@ -62,18 +62,6 @@ void ath9k_hw_txstart(struct ath_hw *ah, - } - EXPORT_SYMBOL(ath9k_hw_txstart); - --void ath9k_hw_cleartxdesc(struct ath_hw *ah, void *ds) --{ -- struct ar5416_desc *ads = AR5416DESC(ds); -- -- ads->ds_txstatus0 = ads->ds_txstatus1 = 0; -- ads->ds_txstatus2 = ads->ds_txstatus3 = 0; -- ads->ds_txstatus4 = ads->ds_txstatus5 = 0; -- ads->ds_txstatus6 = ads->ds_txstatus7 = 0; -- ads->ds_txstatus8 = ads->ds_txstatus9 = 0; --} --EXPORT_SYMBOL(ath9k_hw_cleartxdesc); -- - u32 ath9k_hw_numtxpending(struct ath_hw *ah, u32 q) - { - u32 npend; -@@ -596,7 +584,7 @@ int ath9k_hw_rxprocdesc(struct ath_hw *a - else - rs->rs_keyix = ATH9K_RXKEYIX_INVALID; - -- rs->rs_rate = RXSTATUS_RATE(ah, (&ads)); -+ rs->rs_rate = MS(ads.ds_rxstatus0, AR_RxRate); - rs->rs_more = (ads.ds_rxstatus1 & AR_RxMore) ? 1 : 0; - - rs->rs_isaggr = (ads.ds_rxstatus8 & AR_RxAggr) ? 1 : 0; ---- a/drivers/net/wireless/ath/ath9k/mac.h -+++ b/drivers/net/wireless/ath/ath9k/mac.h -@@ -17,10 +17,6 @@ - #ifndef MAC_H - #define MAC_H - --#define RXSTATUS_RATE(ah, ads) (AR_SREV_5416_20_OR_LATER(ah) ? \ -- MS(ads->ds_rxstatus0, AR_RxRate) : \ -- (ads->ds_rxstatus3 >> 2) & 0xFF) -- - #define set11nTries(_series, _index) \ - (SM((_series)[_index].Tries, AR_XmitDataTries##_index)) - -@@ -263,7 +259,11 @@ struct ath_desc { - #define ATH9K_TXDESC_VMF 0x0100 - #define ATH9K_TXDESC_FRAG_IS_ON 0x0200 - #define ATH9K_TXDESC_LOWRXCHAIN 0x0400 --#define ATH9K_TXDESC_LDPC 0x00010000 -+#define ATH9K_TXDESC_LDPC 0x0800 -+#define ATH9K_TXDESC_CLRDMASK 0x1000 -+ -+#define ATH9K_TXDESC_PAPRD 0x70000 -+#define ATH9K_TXDESC_PAPRD_S 16 - - #define ATH9K_RXDESC_INTREQ 0x0020 - -@@ -659,6 +659,13 @@ struct ath9k_11n_rate_series { - u32 RateFlags; - }; - -+enum aggr_type { -+ AGGR_BUF_NONE, -+ AGGR_BUF_FIRST, -+ AGGR_BUF_MIDDLE, -+ AGGR_BUF_LAST, -+}; -+ - enum ath9k_key_type { - ATH9K_KEY_TYPE_CLEAR, - ATH9K_KEY_TYPE_WEP, -@@ -666,6 +673,33 @@ enum ath9k_key_type { - ATH9K_KEY_TYPE_TKIP, - }; - -+struct ath_tx_info { -+ u8 qcu; -+ -+ bool is_first; -+ bool is_last; -+ -+ enum aggr_type aggr; -+ u8 ndelim; -+ u16 aggr_len; -+ -+ dma_addr_t link; -+ int pkt_len; -+ u32 flags; -+ -+ dma_addr_t buf_addr[4]; -+ int buf_len[4]; -+ -+ struct ath9k_11n_rate_series rates[4]; -+ u8 rtscts_rate; -+ bool dur_update; -+ -+ enum ath9k_pkt_type type; -+ enum ath9k_key_type keytype; -+ u8 keyix; -+ u8 txpower; -+}; -+ - struct ath_hw; - struct ath9k_channel; - enum ath9k_int; -@@ -673,7 +707,6 @@ enum ath9k_int; - u32 ath9k_hw_gettxbuf(struct ath_hw *ah, u32 q); - void ath9k_hw_puttxbuf(struct ath_hw *ah, u32 q, u32 txdp); - void ath9k_hw_txstart(struct ath_hw *ah, u32 q); --void ath9k_hw_cleartxdesc(struct ath_hw *ah, void *ds); - u32 ath9k_hw_numtxpending(struct ath_hw *ah, u32 q); - bool ath9k_hw_updatetxtriglevel(struct ath_hw *ah, bool bIncTrigLevel); - bool ath9k_hw_stop_dma_queue(struct ath_hw *ah, u32 q); ---- a/drivers/net/wireless/ath/ath9k/main.c -+++ b/drivers/net/wireless/ath/ath9k/main.c -@@ -111,24 +111,29 @@ void ath9k_ps_wakeup(struct ath_softc *s - void ath9k_ps_restore(struct ath_softc *sc) - { - struct ath_common *common = ath9k_hw_common(sc->sc_ah); -+ enum ath9k_power_mode mode; - unsigned long flags; - - spin_lock_irqsave(&sc->sc_pm_lock, flags); - if (--sc->ps_usecount != 0) - goto unlock; - -- spin_lock(&common->cc_lock); -- ath_hw_cycle_counters_update(common); -- spin_unlock(&common->cc_lock); -- - if (sc->ps_idle) -- ath9k_hw_setpower(sc->sc_ah, ATH9K_PM_FULL_SLEEP); -+ mode = ATH9K_PM_FULL_SLEEP; - else if (sc->ps_enabled && - !(sc->ps_flags & (PS_WAIT_FOR_BEACON | - PS_WAIT_FOR_CAB | - PS_WAIT_FOR_PSPOLL_DATA | - PS_WAIT_FOR_TX_ACK))) -- ath9k_hw_setpower(sc->sc_ah, ATH9K_PM_NETWORK_SLEEP); -+ mode = ATH9K_PM_NETWORK_SLEEP; -+ else -+ goto unlock; -+ -+ spin_lock(&common->cc_lock); -+ ath_hw_cycle_counters_update(common); -+ spin_unlock(&common->cc_lock); -+ -+ ath9k_hw_setpower(sc->sc_ah, mode); - - unlock: - spin_unlock_irqrestore(&sc->sc_pm_lock, flags); -@@ -247,8 +252,8 @@ static bool ath_prepare_reset(struct ath - - if (!flush) { - if (ah->caps.hw_caps & ATH9K_HW_CAP_EDMA) -- ath_rx_tasklet(sc, 0, true); -- ath_rx_tasklet(sc, 0, false); -+ ath_rx_tasklet(sc, 1, true); -+ ath_rx_tasklet(sc, 1, false); - } else { - ath_flushrecv(sc); - } -@@ -669,15 +674,15 @@ void ath9k_tasklet(unsigned long data) - u32 status = sc->intrstatus; - u32 rxmask; - -+ ath9k_ps_wakeup(sc); -+ spin_lock(&sc->sc_pcu_lock); -+ - if ((status & ATH9K_INT_FATAL) || - (status & ATH9K_INT_BB_WATCHDOG)) { - ieee80211_queue_work(sc->hw, &sc->hw_reset_work); -- return; -+ goto out; - } - -- ath9k_ps_wakeup(sc); -- spin_lock(&sc->sc_pcu_lock); -- - /* - * Only run the baseband hang check if beacons stop working in AP or - * IBSS mode, because it has a high false positive rate. For station -@@ -725,6 +730,7 @@ void ath9k_tasklet(unsigned long data) - if (status & ATH9K_INT_GENTIMER) - ath_gen_timer_isr(sc->sc_ah); - -+out: - /* re-enable hardware interrupt */ - ath9k_hw_enable_interrupts(ah); - -@@ -2015,6 +2021,7 @@ static void ath9k_config_bss(struct ath_ - /* Stop ANI */ - sc->sc_flags &= ~SC_OP_ANI_RUN; - del_timer_sync(&common->ani.timer); -+ memset(&sc->caldata, 0, sizeof(sc->caldata)); - } - } - ---- a/drivers/net/wireless/ath/ath9k/pci.c -+++ b/drivers/net/wireless/ath/ath9k/pci.c -@@ -332,16 +332,16 @@ static int ath_pci_resume(struct device - if ((val & 0x0000ff00) != 0) - pci_write_config_dword(pdev, 0x40, val & 0xffff00ff); - -+ ath9k_ps_wakeup(sc); - /* Enable LED */ - ath9k_hw_cfg_output(sc->sc_ah, sc->sc_ah->led_pin, - AR_GPIO_OUTPUT_MUX_AS_OUTPUT); -- ath9k_hw_set_gpio(sc->sc_ah, sc->sc_ah->led_pin, 1); -+ ath9k_hw_set_gpio(sc->sc_ah, sc->sc_ah->led_pin, 0); - - /* - * Reset key cache to sane defaults (all entries cleared) instead of - * semi-random values after suspend/resume. - */ -- ath9k_ps_wakeup(sc); - ath9k_cmn_init_crypto(sc->sc_ah); - ath9k_ps_restore(sc); - ---- a/drivers/net/wireless/ath/ath9k/recv.c -+++ b/drivers/net/wireless/ath/ath9k/recv.c -@@ -1839,7 +1839,7 @@ int ath_rx_tasklet(struct ath_softc *sc, - * If we're asked to flush receive queue, directly - * chain it back at the queue without processing it. - */ -- if (flush) -+ if (sc->sc_flags & SC_OP_RXFLUSH) - goto requeue_drop_frag; - - retval = ath9k_rx_skb_preprocess(common, hw, hdr, &rs, -@@ -1967,7 +1967,8 @@ requeue: - } else { - list_move_tail(&bf->list, &sc->rx.rxbuf); - ath_rx_buf_link(sc, bf); -- ath9k_hw_rxena(ah); -+ if (!flush) -+ ath9k_hw_rxena(ah); - } - } while (1); - ---- a/drivers/net/wireless/ath/ath9k/xmit.c -+++ b/drivers/net/wireless/ath/ath9k/xmit.c -@@ -56,10 +56,9 @@ static void ath_tx_complete_buf(struct a - struct ath_tx_status *ts, int txok, int sendbar); - static void ath_tx_txqaddbuf(struct ath_softc *sc, struct ath_txq *txq, - struct list_head *head, bool internal); --static void ath_buf_set_rate(struct ath_softc *sc, struct ath_buf *bf, int len); - static void ath_tx_rc_status(struct ath_softc *sc, struct ath_buf *bf, - struct ath_tx_status *ts, int nframes, int nbad, -- int txok, bool update_rc); -+ int txok); - static void ath_tx_update_baw(struct ath_softc *sc, struct ath_atx_tid *tid, - int seqno); - static struct ath_buf *ath_tx_setup_buffer(struct ath_softc *sc, -@@ -263,6 +262,7 @@ static void ath_tx_set_retry(struct ath_ - struct sk_buff *skb) - { - struct ath_frame_info *fi = get_frame_info(skb); -+ struct ath_buf *bf = fi->bf; - struct ieee80211_hdr *hdr; - - TX_STAT_INC(txq->axq_qnum, a_retries); -@@ -271,6 +271,8 @@ static void ath_tx_set_retry(struct ath_ - - hdr = (struct ieee80211_hdr *)skb->data; - hdr->frame_control |= cpu_to_le16(IEEE80211_FCTL_RETRY); -+ dma_sync_single_for_device(sc->dev, bf->bf_buf_addr, -+ sizeof(*hdr), DMA_TO_DEVICE); - } - - static struct ath_buf *ath_tx_get_buffer(struct ath_softc *sc) -@@ -390,11 +392,9 @@ static void ath_tx_complete_aggr(struct - while (bf) { - bf_next = bf->bf_next; - -- bf->bf_state.bf_type |= BUF_XRETRY; - if (!bf->bf_stale || bf_next != NULL) - list_move_tail(&bf->list, &bf_head); - -- ath_tx_rc_status(sc, bf, ts, 1, 1, 0, false); - ath_tx_complete_buf(sc, bf, txq, &bf_head, ts, - 0, 0); - -@@ -470,7 +470,6 @@ static void ath_tx_complete_aggr(struct - clear_filter = true; - txpending = 1; - } else { -- bf->bf_state.bf_type |= BUF_XRETRY; - txfail = 1; - sendbar = 1; - txfail_cnt++; -@@ -497,17 +496,14 @@ static void ath_tx_complete_aggr(struct - - if (rc_update && (acked_cnt == 1 || txfail_cnt == 1)) { - memcpy(tx_info->control.rates, rates, sizeof(rates)); -- ath_tx_rc_status(sc, bf, ts, nframes, nbad, txok, true); -+ ath_tx_rc_status(sc, bf, ts, nframes, nbad, txok); - rc_update = false; -- } else { -- ath_tx_rc_status(sc, bf, ts, nframes, nbad, txok, false); - } - - ath_tx_complete_buf(sc, bf, txq, &bf_head, ts, - !txfail, sendbar); - } else { - /* retry the un-acked ones */ -- ath9k_hw_set_clrdmask(sc->sc_ah, bf->bf_desc, false); - if (!(sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)) { - if (bf->bf_next == NULL && bf_last->bf_stale) { - struct ath_buf *tbf; -@@ -523,26 +519,13 @@ static void ath_tx_complete_aggr(struct - ath_tx_update_baw(sc, tid, seqno); - spin_unlock_bh(&txq->axq_lock); - -- bf->bf_state.bf_type |= -- BUF_XRETRY; -- ath_tx_rc_status(sc, bf, ts, nframes, -- nbad, 0, false); - ath_tx_complete_buf(sc, bf, txq, - &bf_head, -- ts, 0, 0); -+ ts, 0, 1); - break; - } - -- ath9k_hw_cleartxdesc(sc->sc_ah, -- tbf->bf_desc); - fi->bf = tbf; -- } else { -- /* -- * Clear descriptor status words for -- * software retry -- */ -- ath9k_hw_cleartxdesc(sc->sc_ah, -- bf->bf_desc); - } - } - -@@ -778,7 +761,7 @@ static enum ATH_AGGR_STATUS ath_tx_form_ - if (!bf) - continue; - -- bf->bf_state.bf_type |= BUF_AMPDU; -+ bf->bf_state.bf_type = BUF_AMPDU | BUF_AGGR; - seqno = bf->bf_state.seqno; - if (!bf_first) - bf_first = bf; -@@ -805,8 +788,7 @@ static enum ATH_AGGR_STATUS ath_tx_form_ - } - - tx_info = IEEE80211_SKB_CB(bf->bf_mpdu); -- if (nframes && ((tx_info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE) || -- !(tx_info->control.rates[0].flags & IEEE80211_TX_RC_MCS))) -+ if (nframes && (tx_info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE)) - break; - - /* do not exceed subframe limit */ -@@ -828,20 +810,17 @@ static enum ATH_AGGR_STATUS ath_tx_form_ - - nframes++; - bf->bf_next = NULL; -- ath9k_hw_set_desc_link(sc->sc_ah, bf->bf_desc, 0); - - /* link buffers of this frame to the aggregate */ - if (!fi->retries) - ath_tx_addto_baw(sc, tid, seqno); -- ath9k_hw_set11n_aggr_middle(sc->sc_ah, bf->bf_desc, ndelim); -+ bf->bf_state.ndelim = ndelim; - - __skb_unlink(skb, &tid->buf_q); - list_add_tail(&bf->list, bf_q); -- if (bf_prev) { -+ if (bf_prev) - bf_prev->bf_next = bf; -- ath9k_hw_set_desc_link(sc->sc_ah, bf_prev->bf_desc, -- bf->bf_daddr); -- } -+ - bf_prev = bf; - - } while (!skb_queue_empty(&tid->buf_q)); -@@ -852,12 +831,245 @@ static enum ATH_AGGR_STATUS ath_tx_form_ - #undef PADBYTES - } - -+/* -+ * rix - rate index -+ * pktlen - total bytes (delims + data + fcs + pads + pad delims) -+ * width - 0 for 20 MHz, 1 for 40 MHz -+ * half_gi - to use 4us v/s 3.6 us for symbol time -+ */ -+static u32 ath_pkt_duration(struct ath_softc *sc, u8 rix, int pktlen, -+ int width, int half_gi, bool shortPreamble) -+{ -+ u32 nbits, nsymbits, duration, nsymbols; -+ int streams; -+ -+ /* find number of symbols: PLCP + data */ -+ streams = HT_RC_2_STREAMS(rix); -+ nbits = (pktlen << 3) + OFDM_PLCP_BITS; -+ nsymbits = bits_per_symbol[rix % 8][width] * streams; -+ nsymbols = (nbits + nsymbits - 1) / nsymbits; -+ -+ if (!half_gi) -+ duration = SYMBOL_TIME(nsymbols); -+ else -+ duration = SYMBOL_TIME_HALFGI(nsymbols); -+ -+ /* addup duration for legacy/ht training and signal fields */ -+ duration += L_STF + L_LTF + L_SIG + HT_SIG + HT_STF + HT_LTF(streams); -+ -+ return duration; -+} -+ -+static void ath_buf_set_rate(struct ath_softc *sc, struct ath_buf *bf, -+ struct ath_tx_info *info, int len) -+{ -+ struct ath_hw *ah = sc->sc_ah; -+ struct sk_buff *skb; -+ struct ieee80211_tx_info *tx_info; -+ struct ieee80211_tx_rate *rates; -+ const struct ieee80211_rate *rate; -+ struct ieee80211_hdr *hdr; -+ int i; -+ u8 rix = 0; -+ -+ skb = bf->bf_mpdu; -+ tx_info = IEEE80211_SKB_CB(skb); -+ rates = tx_info->control.rates; -+ hdr = (struct ieee80211_hdr *)skb->data; -+ -+ /* set dur_update_en for l-sig computation except for PS-Poll frames */ -+ info->dur_update = !ieee80211_is_pspoll(hdr->frame_control); -+ -+ /* -+ * We check if Short Preamble is needed for the CTS rate by -+ * checking the BSS's global flag. -+ * But for the rate series, IEEE80211_TX_RC_USE_SHORT_PREAMBLE is used. -+ */ -+ rate = ieee80211_get_rts_cts_rate(sc->hw, tx_info); -+ info->rtscts_rate = rate->hw_value; -+ if (sc->sc_flags & SC_OP_PREAMBLE_SHORT) -+ info->rtscts_rate |= rate->hw_value_short; -+ -+ for (i = 0; i < 4; i++) { -+ bool is_40, is_sgi, is_sp; -+ int phy; -+ -+ if (!rates[i].count || (rates[i].idx < 0)) -+ continue; -+ -+ rix = rates[i].idx; -+ info->rates[i].Tries = rates[i].count; -+ -+ if (rates[i].flags & IEEE80211_TX_RC_USE_RTS_CTS) { -+ info->rates[i].RateFlags |= ATH9K_RATESERIES_RTS_CTS; -+ info->flags |= ATH9K_TXDESC_RTSENA; -+ } else if (rates[i].flags & IEEE80211_TX_RC_USE_CTS_PROTECT) { -+ info->rates[i].RateFlags |= ATH9K_RATESERIES_RTS_CTS; -+ info->flags |= ATH9K_TXDESC_CTSENA; -+ } -+ -+ if (rates[i].flags & IEEE80211_TX_RC_40_MHZ_WIDTH) -+ info->rates[i].RateFlags |= ATH9K_RATESERIES_2040; -+ if (rates[i].flags & IEEE80211_TX_RC_SHORT_GI) -+ info->rates[i].RateFlags |= ATH9K_RATESERIES_HALFGI; -+ -+ is_sgi = !!(rates[i].flags & IEEE80211_TX_RC_SHORT_GI); -+ is_40 = !!(rates[i].flags & IEEE80211_TX_RC_40_MHZ_WIDTH); -+ is_sp = !!(rates[i].flags & IEEE80211_TX_RC_USE_SHORT_PREAMBLE); -+ -+ if (rates[i].flags & IEEE80211_TX_RC_MCS) { -+ /* MCS rates */ -+ info->rates[i].Rate = rix | 0x80; -+ info->rates[i].ChSel = ath_txchainmask_reduction(sc, -+ ah->txchainmask, info->rates[i].Rate); -+ info->rates[i].PktDuration = ath_pkt_duration(sc, rix, len, -+ is_40, is_sgi, is_sp); -+ if (rix < 8 && (tx_info->flags & IEEE80211_TX_CTL_STBC)) -+ info->rates[i].RateFlags |= ATH9K_RATESERIES_STBC; -+ continue; -+ } -+ -+ /* legacy rates */ -+ if ((tx_info->band == IEEE80211_BAND_2GHZ) && -+ !(rate->flags & IEEE80211_RATE_ERP_G)) -+ phy = WLAN_RC_PHY_CCK; -+ else -+ phy = WLAN_RC_PHY_OFDM; -+ -+ rate = &sc->sbands[tx_info->band].bitrates[rates[i].idx]; -+ info->rates[i].Rate = rate->hw_value; -+ if (rate->hw_value_short) { -+ if (rates[i].flags & IEEE80211_TX_RC_USE_SHORT_PREAMBLE) -+ info->rates[i].Rate |= rate->hw_value_short; -+ } else { -+ is_sp = false; -+ } -+ -+ if (bf->bf_state.bfs_paprd) -+ info->rates[i].ChSel = ah->txchainmask; -+ else -+ info->rates[i].ChSel = ath_txchainmask_reduction(sc, -+ ah->txchainmask, info->rates[i].Rate); -+ -+ info->rates[i].PktDuration = ath9k_hw_computetxtime(sc->sc_ah, -+ phy, rate->bitrate * 100, len, rix, is_sp); -+ } -+ -+ /* For AR5416 - RTS cannot be followed by a frame larger than 8K */ -+ if (bf_isaggr(bf) && (len > sc->sc_ah->caps.rts_aggr_limit)) -+ info->flags &= ~ATH9K_TXDESC_RTSENA; -+ -+ /* ATH9K_TXDESC_RTSENA and ATH9K_TXDESC_CTSENA are mutually exclusive. */ -+ if (info->flags & ATH9K_TXDESC_RTSENA) -+ info->flags &= ~ATH9K_TXDESC_CTSENA; -+} -+ -+static enum ath9k_pkt_type get_hw_packet_type(struct sk_buff *skb) -+{ -+ struct ieee80211_hdr *hdr; -+ enum ath9k_pkt_type htype; -+ __le16 fc; -+ -+ hdr = (struct ieee80211_hdr *)skb->data; -+ fc = hdr->frame_control; -+ -+ if (ieee80211_is_beacon(fc)) -+ htype = ATH9K_PKT_TYPE_BEACON; -+ else if (ieee80211_is_probe_resp(fc)) -+ htype = ATH9K_PKT_TYPE_PROBE_RESP; -+ else if (ieee80211_is_atim(fc)) -+ htype = ATH9K_PKT_TYPE_ATIM; -+ else if (ieee80211_is_pspoll(fc)) -+ htype = ATH9K_PKT_TYPE_PSPOLL; -+ else -+ htype = ATH9K_PKT_TYPE_NORMAL; -+ -+ return htype; -+} -+ -+static void ath_tx_fill_desc(struct ath_softc *sc, struct ath_buf *bf, -+ struct ath_txq *txq, int len) -+{ -+ struct ath_hw *ah = sc->sc_ah; -+ struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(bf->bf_mpdu); -+ struct ath_buf *bf_first = bf; -+ struct ath_tx_info info; -+ bool aggr = !!(bf->bf_state.bf_type & BUF_AGGR); -+ -+ memset(&info, 0, sizeof(info)); -+ info.is_first = true; -+ info.is_last = true; -+ info.txpower = MAX_RATE_POWER; -+ info.qcu = txq->axq_qnum; -+ -+ info.flags = ATH9K_TXDESC_INTREQ; -+ if (tx_info->flags & IEEE80211_TX_CTL_NO_ACK) -+ info.flags |= ATH9K_TXDESC_NOACK; -+ if (tx_info->flags & IEEE80211_TX_CTL_LDPC) -+ info.flags |= ATH9K_TXDESC_LDPC; -+ -+ ath_buf_set_rate(sc, bf, &info, len); -+ -+ if (tx_info->flags & IEEE80211_TX_CTL_CLEAR_PS_FILT) -+ info.flags |= ATH9K_TXDESC_CLRDMASK; -+ -+ if (bf->bf_state.bfs_paprd) -+ info.flags |= (u32) bf->bf_state.bfs_paprd << ATH9K_TXDESC_PAPRD_S; -+ -+ -+ while (bf) { -+ struct sk_buff *skb = bf->bf_mpdu; -+ struct ath_frame_info *fi = get_frame_info(skb); -+ struct ieee80211_hdr *hdr; -+ int padpos, padsize; -+ -+ info.type = get_hw_packet_type(skb); -+ if (bf->bf_next) -+ info.link = bf->bf_next->bf_daddr; -+ else -+ info.link = 0; -+ -+ if (ah->caps.hw_caps & ATH9K_HW_CAP_EDMA) { -+ hdr = (struct ieee80211_hdr *)skb->data; -+ padpos = ath9k_cmn_padpos(hdr->frame_control); -+ padsize = padpos & 3; -+ -+ info.buf_addr[0] = bf->bf_buf_addr; -+ info.buf_len[0] = padpos + padsize; -+ info.buf_addr[1] = info.buf_addr[0] + padpos; -+ info.buf_len[1] = skb->len - padpos; -+ } else { -+ info.buf_addr[0] = bf->bf_buf_addr; -+ info.buf_len[0] = skb->len; -+ } -+ -+ info.pkt_len = fi->framelen; -+ info.keyix = fi->keyix; -+ info.keytype = fi->keytype; -+ -+ if (aggr) { -+ if (bf == bf_first) -+ info.aggr = AGGR_BUF_FIRST; -+ else if (!bf->bf_next) -+ info.aggr = AGGR_BUF_LAST; -+ else -+ info.aggr = AGGR_BUF_MIDDLE; -+ -+ info.ndelim = bf->bf_state.ndelim; -+ info.aggr_len = len; -+ } -+ -+ ath9k_hw_set_txdesc(ah, bf->bf_desc, &info); -+ bf = bf->bf_next; -+ } -+} -+ - static void ath_tx_sched_aggr(struct ath_softc *sc, struct ath_txq *txq, - struct ath_atx_tid *tid) +--- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c ++++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c +@@ -326,7 +326,6 @@ static bool ar9003_hw_get_isr(struct ath + static int ar9003_hw_proc_txdesc(struct ath_hw *ah, void *ds, + struct ath_tx_status *ts) { - struct ath_buf *bf; - enum ATH_AGGR_STATUS status; -- struct ath_frame_info *fi; -+ struct ieee80211_tx_info *tx_info; - struct list_head bf_q; - int aggr_len; - -@@ -878,34 +1090,25 @@ static void ath_tx_sched_aggr(struct ath - - bf = list_first_entry(&bf_q, struct ath_buf, list); - bf->bf_lastbf = list_entry(bf_q.prev, struct ath_buf, list); -+ tx_info = IEEE80211_SKB_CB(bf->bf_mpdu); - - if (tid->ac->clear_ps_filter) { - tid->ac->clear_ps_filter = false; -- ath9k_hw_set_clrdmask(sc->sc_ah, bf->bf_desc, true); -+ tx_info->flags |= IEEE80211_TX_CTL_CLEAR_PS_FILT; -+ } else { -+ tx_info->flags &= ~IEEE80211_TX_CTL_CLEAR_PS_FILT; - } - - /* if only one frame, send as non-aggregate */ - if (bf == bf->bf_lastbf) { -- fi = get_frame_info(bf->bf_mpdu); -- -- bf->bf_state.bf_type &= ~BUF_AGGR; -- ath9k_hw_clr11n_aggr(sc->sc_ah, bf->bf_desc); -- ath_buf_set_rate(sc, bf, fi->framelen); -- ath_tx_txqaddbuf(sc, txq, &bf_q, false); -- continue; -+ aggr_len = get_frame_info(bf->bf_mpdu)->framelen; -+ bf->bf_state.bf_type = BUF_AMPDU; -+ } else { -+ TX_STAT_INC(txq->axq_qnum, a_aggr); - } - -- /* setup first desc of aggregate */ -- bf->bf_state.bf_type |= BUF_AGGR; -- ath_buf_set_rate(sc, bf, aggr_len); -- ath9k_hw_set11n_aggr_first(sc->sc_ah, bf->bf_desc, aggr_len); -- -- /* anchor last desc of aggregate */ -- ath9k_hw_set11n_aggr_last(sc->sc_ah, bf->bf_lastbf->bf_desc); -- -+ ath_tx_fill_desc(sc, bf, txq, aggr_len); - ath_tx_txqaddbuf(sc, txq, &bf_q, false); -- TX_STAT_INC(txq->axq_qnum, a_aggr); -- - } while (txq->axq_ampdu_depth < ATH_AGGR_MIN_QDEPTH && - status != ATH_AGGR_BAW_CLOSED); - } -@@ -1483,7 +1686,7 @@ static void ath_tx_send_ampdu(struct ath - if (!bf) - return; - -- bf->bf_state.bf_type |= BUF_AMPDU; -+ bf->bf_state.bf_type = BUF_AMPDU; - INIT_LIST_HEAD(&bf_head); - list_add(&bf->list, &bf_head); - -@@ -1493,7 +1696,7 @@ static void ath_tx_send_ampdu(struct ath - /* Queue to h/w without aggregation */ - TX_STAT_INC(txctl->txq->axq_qnum, a_queued_hw); - bf->bf_lastbf = bf; -- ath_buf_set_rate(sc, bf, fi->framelen); -+ ath_tx_fill_desc(sc, bf, txctl->txq, fi->framelen); - ath_tx_txqaddbuf(sc, txctl->txq, &bf_head, false); - } - -@@ -1513,41 +1716,18 @@ static void ath_tx_send_normal(struct at - - INIT_LIST_HEAD(&bf_head); - list_add_tail(&bf->list, &bf_head); -- bf->bf_state.bf_type &= ~BUF_AMPDU; -+ bf->bf_state.bf_type = 0; +- struct ar9003_txc *txc = (struct ar9003_txc *) ds; + struct ar9003_txs *ads; + u32 status; - /* update starting sequence number for subsequent ADDBA request */ - if (tid) - INCR(tid->seq_start, IEEE80211_SEQ_MAX); - - bf->bf_lastbf = bf; -- ath_buf_set_rate(sc, bf, fi->framelen); -+ ath_tx_fill_desc(sc, bf, txq, fi->framelen); - ath_tx_txqaddbuf(sc, txq, &bf_head, false); - TX_STAT_INC(txq->axq_qnum, queued); - } - --static enum ath9k_pkt_type get_hw_packet_type(struct sk_buff *skb) --{ -- struct ieee80211_hdr *hdr; -- enum ath9k_pkt_type htype; -- __le16 fc; -- -- hdr = (struct ieee80211_hdr *)skb->data; -- fc = hdr->frame_control; -- -- if (ieee80211_is_beacon(fc)) -- htype = ATH9K_PKT_TYPE_BEACON; -- else if (ieee80211_is_probe_resp(fc)) -- htype = ATH9K_PKT_TYPE_PROBE_RESP; -- else if (ieee80211_is_atim(fc)) -- htype = ATH9K_PKT_TYPE_ATIM; -- else if (ieee80211_is_pspoll(fc)) -- htype = ATH9K_PKT_TYPE_PSPOLL; -- else -- htype = ATH9K_PKT_TYPE_NORMAL; -- -- return htype; --} -- - static void setup_frame_info(struct ieee80211_hw *hw, struct sk_buff *skb, - int framelen) - { -@@ -1575,51 +1755,6 @@ static void setup_frame_info(struct ieee - fi->framelen = framelen; - } +@@ -336,11 +335,7 @@ static int ar9003_hw_proc_txdesc(struct + if ((status & AR_TxDone) == 0) + return -EINPROGRESS; --static int setup_tx_flags(struct sk_buff *skb) --{ -- struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb); -- int flags = 0; -- -- flags |= ATH9K_TXDESC_INTREQ; -- -- if (tx_info->flags & IEEE80211_TX_CTL_NO_ACK) -- flags |= ATH9K_TXDESC_NOACK; -- -- if (tx_info->flags & IEEE80211_TX_CTL_LDPC) -- flags |= ATH9K_TXDESC_LDPC; -- -- return flags; --} -- --/* -- * rix - rate index -- * pktlen - total bytes (delims + data + fcs + pads + pad delims) -- * width - 0 for 20 MHz, 1 for 40 MHz -- * half_gi - to use 4us v/s 3.6 us for symbol time -- */ --static u32 ath_pkt_duration(struct ath_softc *sc, u8 rix, int pktlen, -- int width, int half_gi, bool shortPreamble) --{ -- u32 nbits, nsymbits, duration, nsymbols; -- int streams; -- -- /* find number of symbols: PLCP + data */ -- streams = HT_RC_2_STREAMS(rix); -- nbits = (pktlen << 3) + OFDM_PLCP_BITS; -- nsymbits = bits_per_symbol[rix % 8][width] * streams; -- nsymbols = (nbits + nsymbits - 1) / nsymbits; -- -- if (!half_gi) -- duration = SYMBOL_TIME(nsymbols); +- ts->qid = MS(ads->ds_info, AR_TxQcuNum); +- if (!txc || (MS(txc->info, AR_TxQcuNum) == ts->qid)) +- ah->ts_tail = (ah->ts_tail + 1) % ah->ts_size; - else -- duration = SYMBOL_TIME_HALFGI(nsymbols); -- -- /* addup duration for legacy/ht training and signal fields */ -- duration += L_STF + L_LTF + L_SIG + HT_SIG + HT_STF + HT_LTF(streams); -- -- return duration; --} -- - u8 ath_txchainmask_reduction(struct ath_softc *sc, u8 chainmask, u32 rate) - { - struct ath_hw *ah = sc->sc_ah; -@@ -1632,118 +1767,6 @@ u8 ath_txchainmask_reduction(struct ath_ - return chainmask; - } - --static void ath_buf_set_rate(struct ath_softc *sc, struct ath_buf *bf, int len) --{ -- struct ath_hw *ah = sc->sc_ah; -- struct ath9k_11n_rate_series series[4]; -- struct sk_buff *skb; -- struct ieee80211_tx_info *tx_info; -- struct ieee80211_tx_rate *rates; -- const struct ieee80211_rate *rate; -- struct ieee80211_hdr *hdr; -- int i, flags = 0; -- u8 rix = 0, ctsrate = 0; -- bool is_pspoll; -- -- memset(series, 0, sizeof(struct ath9k_11n_rate_series) * 4); -- -- skb = bf->bf_mpdu; -- tx_info = IEEE80211_SKB_CB(skb); -- rates = tx_info->control.rates; -- hdr = (struct ieee80211_hdr *)skb->data; -- is_pspoll = ieee80211_is_pspoll(hdr->frame_control); -- -- /* -- * We check if Short Preamble is needed for the CTS rate by -- * checking the BSS's global flag. -- * But for the rate series, IEEE80211_TX_RC_USE_SHORT_PREAMBLE is used. -- */ -- rate = ieee80211_get_rts_cts_rate(sc->hw, tx_info); -- ctsrate = rate->hw_value; -- if (sc->sc_flags & SC_OP_PREAMBLE_SHORT) -- ctsrate |= rate->hw_value_short; -- -- for (i = 0; i < 4; i++) { -- bool is_40, is_sgi, is_sp; -- int phy; -- -- if (!rates[i].count || (rates[i].idx < 0)) -- continue; -- -- rix = rates[i].idx; -- series[i].Tries = rates[i].count; -- -- if (rates[i].flags & IEEE80211_TX_RC_USE_RTS_CTS) { -- series[i].RateFlags |= ATH9K_RATESERIES_RTS_CTS; -- flags |= ATH9K_TXDESC_RTSENA; -- } else if (rates[i].flags & IEEE80211_TX_RC_USE_CTS_PROTECT) { -- series[i].RateFlags |= ATH9K_RATESERIES_RTS_CTS; -- flags |= ATH9K_TXDESC_CTSENA; -- } -- -- if (rates[i].flags & IEEE80211_TX_RC_40_MHZ_WIDTH) -- series[i].RateFlags |= ATH9K_RATESERIES_2040; -- if (rates[i].flags & IEEE80211_TX_RC_SHORT_GI) -- series[i].RateFlags |= ATH9K_RATESERIES_HALFGI; -- -- is_sgi = !!(rates[i].flags & IEEE80211_TX_RC_SHORT_GI); -- is_40 = !!(rates[i].flags & IEEE80211_TX_RC_40_MHZ_WIDTH); -- is_sp = !!(rates[i].flags & IEEE80211_TX_RC_USE_SHORT_PREAMBLE); -- -- if (rates[i].flags & IEEE80211_TX_RC_MCS) { -- /* MCS rates */ -- series[i].Rate = rix | 0x80; -- series[i].ChSel = ath_txchainmask_reduction(sc, -- ah->txchainmask, series[i].Rate); -- series[i].PktDuration = ath_pkt_duration(sc, rix, len, -- is_40, is_sgi, is_sp); -- if (rix < 8 && (tx_info->flags & IEEE80211_TX_CTL_STBC)) -- series[i].RateFlags |= ATH9K_RATESERIES_STBC; -- continue; -- } -- -- /* legacy rates */ -- if ((tx_info->band == IEEE80211_BAND_2GHZ) && -- !(rate->flags & IEEE80211_RATE_ERP_G)) -- phy = WLAN_RC_PHY_CCK; -- else -- phy = WLAN_RC_PHY_OFDM; -- -- rate = &sc->sbands[tx_info->band].bitrates[rates[i].idx]; -- series[i].Rate = rate->hw_value; -- if (rate->hw_value_short) { -- if (rates[i].flags & IEEE80211_TX_RC_USE_SHORT_PREAMBLE) -- series[i].Rate |= rate->hw_value_short; -- } else { -- is_sp = false; -- } -- -- if (bf->bf_state.bfs_paprd) -- series[i].ChSel = ah->txchainmask; -- else -- series[i].ChSel = ath_txchainmask_reduction(sc, -- ah->txchainmask, series[i].Rate); -- -- series[i].PktDuration = ath9k_hw_computetxtime(sc->sc_ah, -- phy, rate->bitrate * 100, len, rix, is_sp); +- return -ENOENT; ++ ah->ts_tail = (ah->ts_tail + 1) % ah->ts_size; + + if ((MS(ads->ds_info, AR_DescId) != ATHEROS_VENDOR_ID) || + (MS(ads->ds_info, AR_TxRxDesc) != 1)) { +@@ -354,6 +349,7 @@ static int ar9003_hw_proc_txdesc(struct + ts->ts_seqnum = MS(status, AR_SeqNum); + ts->tid = MS(status, AR_TxTid); + ++ ts->qid = MS(ads->ds_info, AR_TxQcuNum); + ts->desc_id = MS(ads->status1, AR_TxDescId); + ts->ts_tstamp = ads->status4; + ts->ts_status = 0; +@@ -440,20 +436,14 @@ int ath9k_hw_process_rxdesc_edma(struct + struct ar9003_rxs *rxsp = (struct ar9003_rxs *) buf_addr; + unsigned int phyerr; + +- /* TODO: byte swap on big endian for ar9300_10 */ +- +- if (!rxs) { +- if ((rxsp->status11 & AR_RxDone) == 0) +- return -EINPROGRESS; +- +- if (MS(rxsp->ds_info, AR_DescId) != 0x168c) +- return -EINVAL; ++ if ((rxsp->status11 & AR_RxDone) == 0) ++ return -EINPROGRESS; + +- if ((rxsp->ds_info & (AR_TxRxDesc | AR_CtrlStat)) != 0) +- return -EINPROGRESS; ++ if (MS(rxsp->ds_info, AR_DescId) != 0x168c) ++ return -EINVAL; + +- return 0; - } -- -- /* For AR5416 - RTS cannot be followed by a frame larger than 8K */ -- if (bf_isaggr(bf) && (len > sc->sc_ah->caps.rts_aggr_limit)) -- flags &= ~ATH9K_TXDESC_RTSENA; -- -- /* ATH9K_TXDESC_RTSENA and ATH9K_TXDESC_CTSENA are mutually exclusive. */ -- if (flags & ATH9K_TXDESC_RTSENA) -- flags &= ~ATH9K_TXDESC_CTSENA; -- -- /* set dur_update_en for l-sig computation except for PS-Poll frames */ -- ath9k_hw_set11n_ratescenario(sc->sc_ah, bf->bf_desc, -- bf->bf_lastbf->bf_desc, -- !is_pspoll, ctsrate, -- 0, series, 4, flags); -- --} -- - /* - * Assign a descriptor (and sequence number if necessary, - * and map buffer for DMA. Frees skb on error -@@ -1753,13 +1776,10 @@ static struct ath_buf *ath_tx_setup_buff - struct ath_atx_tid *tid, - struct sk_buff *skb) - { -- struct ath_hw *ah = sc->sc_ah; - struct ath_common *common = ath9k_hw_common(sc->sc_ah); - struct ath_frame_info *fi = get_frame_info(skb); - struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; - struct ath_buf *bf; -- struct ath_desc *ds; -- int frm_type; - u16 seqno; - - bf = ath_tx_get_buffer(sc); -@@ -1777,7 +1797,6 @@ static struct ath_buf *ath_tx_setup_buff - bf->bf_state.seqno = seqno; - } - -- bf->bf_flags = setup_tx_flags(skb); - bf->bf_mpdu = skb; - - bf->bf_buf_addr = dma_map_single(sc->dev, skb->data, -@@ -1791,22 +1810,6 @@ static struct ath_buf *ath_tx_setup_buff - goto error; - } - -- frm_type = get_hw_packet_type(skb); -- -- ds = bf->bf_desc; -- ath9k_hw_set_desc_link(ah, ds, 0); -- -- ath9k_hw_set11n_txdesc(ah, ds, fi->framelen, frm_type, MAX_RATE_POWER, -- fi->keyix, fi->keytype, bf->bf_flags); -- -- ath9k_hw_filltxdesc(ah, ds, -- skb->len, /* segment length */ -- true, /* first segment */ -- true, /* last segment */ -- ds, /* first descriptor */ -- bf->bf_buf_addr, -- txq->axq_qnum); -- - fi->bf = bf; - - return bf; -@@ -1849,16 +1852,9 @@ static void ath_tx_start_dma(struct ath_ - - bf->bf_state.bfs_paprd = txctl->paprd; - -- if (bf->bf_state.bfs_paprd) -- ar9003_hw_set_paprd_txdesc(sc->sc_ah, bf->bf_desc, -- bf->bf_state.bfs_paprd); -- - if (txctl->paprd) - bf->bf_state.bfs_paprd_timestamp = jiffies; ++ if ((rxsp->ds_info & (AR_TxRxDesc | AR_CtrlStat)) != 0) ++ return -EINPROGRESS; -- if (tx_info->flags & IEEE80211_TX_CTL_CLEAR_PS_FILT) -- ath9k_hw_set_clrdmask(sc->sc_ah, bf->bf_desc, true); -- - ath_tx_send_normal(sc, txctl->txq, tid, skb); - } - -@@ -1899,15 +1895,18 @@ int ath_tx_start(struct ieee80211_hw *hw - hdr->seq_ctrl |= cpu_to_le16(sc->tx.seq_no); - } - -- /* Add the padding after the header if this is not already done */ -- padpos = ath9k_cmn_padpos(hdr->frame_control); -- padsize = padpos & 3; -- if (padsize && skb->len > padpos) { -- if (skb_headroom(skb) < padsize) -- return -ENOMEM; + rxs->rs_status = 0; + rxs->rs_flags = 0; +@@ -510,7 +500,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 +526,7 @@ int ath9k_hw_process_rxdesc_edma(struct + rxs->rs_status |= ATH9K_RXERR_PHY; + rxs->rs_phyerr = phyerr; + } - -- skb_push(skb, padsize); -- memmove(skb->data, skb->data + padsize, padpos); -+ if (!(sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)) { -+ /* Add the padding after the header if this is not already done */ -+ padpos = ath9k_cmn_padpos(hdr->frame_control); -+ padsize = padpos & 3; -+ if (padsize && skb->len > padpos) { -+ if (skb_headroom(skb) < padsize) -+ return -ENOMEM; -+ -+ skb_push(skb, padsize); -+ memmove(skb->data, skb->data + padsize, padpos); -+ hdr = (struct ieee80211_hdr *) skb->data; -+ } - } - - if ((vif && vif->type != NL80211_IFTYPE_AP && -@@ -1953,20 +1952,21 @@ static void ath_tx_complete(struct ath_s - if (tx_flags & ATH_TX_BAR) - tx_info->flags |= IEEE80211_TX_STAT_AMPDU_NO_BACK; - -- if (!(tx_flags & (ATH_TX_ERROR | ATH_TX_XRETRY))) { -+ if (!(tx_flags & ATH_TX_ERROR)) - /* Frame was ACKed */ - tx_info->flags |= IEEE80211_TX_STAT_ACK; -- } - -- padpos = ath9k_cmn_padpos(hdr->frame_control); -- padsize = padpos & 3; -- if (padsize && skb->len>padpos+padsize) { -- /* -- * Remove MAC header padding before giving the frame back to -- * mac80211. -- */ -- memmove(skb->data + padsize, skb->data, padpos); -- skb_pull(skb, padsize); -+ if (!(sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)) { -+ padpos = ath9k_cmn_padpos(hdr->frame_control); -+ padsize = padpos & 3; -+ if (padsize && skb->len>padpos+padsize) { -+ /* -+ * Remove MAC header padding before giving the frame back to -+ * mac80211. -+ */ -+ memmove(skb->data + padsize, skb->data, padpos); -+ skb_pull(skb, padsize); -+ } +- } 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 (sc->ps_flags & PS_WAIT_FOR_TX_ACK) { -@@ -2000,18 +2000,18 @@ static void ath_tx_complete_buf(struct a - struct ath_tx_status *ts, int txok, int sendbar) + 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 sk_buff *skb = bf->bf_mpdu; -+ struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb); - unsigned long flags; - int tx_flags = 0; + struct ieee80211_sta *sta; + struct carl9170_sta_info *sta_info; ++ struct ieee80211_tx_info *tx_info; - if (sendbar) - tx_flags = ATH_TX_BAR; + 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; -- if (!txok) { -+ if (!txok) - tx_flags |= ATH_TX_ERROR; + sta_info = (void *) sta->drv_priv; +- if (unlikely(sta_info->sleeping)) { +- struct ieee80211_tx_info *tx_info; ++ tx_info = IEEE80211_SKB_CB(skb); -- if (bf_isxretried(bf)) -- tx_flags |= ATH_TX_XRETRY; -- } -+ if (ts->ts_status & ATH9K_TXERR_FILT) -+ tx_info->flags |= IEEE80211_TX_STAT_TX_FILTERED; - - dma_unmap_single(sc->dev, bf->bf_buf_addr, skb->len, DMA_TO_DEVICE); - bf->bf_buf_addr = 0; -@@ -2024,7 +2024,7 @@ static void ath_tx_complete_buf(struct a - else - complete(&sc->paprd_complete); - } else { -- ath_debug_stat_tx(sc, bf, ts, txq); -+ ath_debug_stat_tx(sc, bf, ts, txq, tx_flags); - ath_tx_complete(sc, skb, tx_flags, txq); - } - /* At this point, skb (bf->bf_mpdu) is consumed...make sure we don't -@@ -2042,7 +2042,7 @@ static void ath_tx_complete_buf(struct a ++ if (unlikely(sta_info->sleeping) && ++ !(tx_info->flags & (IEEE80211_TX_CTL_NO_PS_BUFFER | ++ IEEE80211_TX_CTL_CLEAR_PS_FILT))) { + rcu_read_unlock(); - static void ath_tx_rc_status(struct ath_softc *sc, struct ath_buf *bf, - struct ath_tx_status *ts, int nframes, int nbad, -- int txok, bool update_rc) -+ int txok) - { - struct sk_buff *skb = bf->bf_mpdu; - struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; -@@ -2057,9 +2057,7 @@ static void ath_tx_rc_status(struct ath_ - tx_rateindex = ts->ts_rateindex; - WARN_ON(tx_rateindex >= hw->max_rates); - -- if (ts->ts_status & ATH9K_TXERR_FILT) -- tx_info->flags |= IEEE80211_TX_STAT_TX_FILTERED; -- if ((tx_info->flags & IEEE80211_TX_CTL_AMPDU) && update_rc) { -+ if (tx_info->flags & IEEE80211_TX_CTL_AMPDU) { - tx_info->flags |= IEEE80211_TX_STAT_AMPDU; - - BUG_ON(nbad > nframes); -@@ -2069,7 +2067,7 @@ static void ath_tx_rc_status(struct ath_ - } +- 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 ((ts->ts_status & ATH9K_TXERR_FILT) == 0 && -- (bf->bf_flags & ATH9K_TXDESC_NOACK) == 0 && update_rc) { -+ (tx_info->flags & IEEE80211_TX_CTL_NO_ACK) == 0) { + if (sta_priv && sta_priv->asleep && +- (info->flags & IEEE80211_TX_CTL_POLL_RESPONSE)) { ++ (info->flags & IEEE80211_TX_CTL_NO_PS_BUFFER)) { /* - * If an underrun error is seen assume it as an excessive - * retry only if max frame trigger level has been reached -@@ -2082,9 +2080,9 @@ static void ath_tx_rc_status(struct ath_ - * successfully by eventually preferring slower rates. - * This itself should also alleviate congestion on the bus. + * 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. */ -- if (ieee80211_is_data(hdr->frame_control) && -- (ts->ts_flags & (ATH9K_TX_DATA_UNDERRUN | -- ATH9K_TX_DELIM_UNDERRUN)) && -+ if (unlikely(ts->ts_flags & (ATH9K_TX_DATA_UNDERRUN | -+ ATH9K_TX_DELIM_UNDERRUN)) && -+ ieee80211_is_data(hdr->frame_control) && - ah->tx_trig_level >= sc->sc_ah->config.max_txtrig_level) - tx_info->status.rates[tx_rateindex].count = - hw->max_rate_tries; -@@ -2115,13 +2113,7 @@ static void ath_tx_process_buffer(struct - spin_unlock_bh(&txq->axq_lock); - - if (!bf_isampdu(bf)) { -- /* -- * This frame is sent out as a single frame. -- * Use hardware retry status for this frame. -- */ -- if (ts->ts_status & ATH9K_TXERR_XRETRY) -- bf->bf_state.bf_type |= BUF_XRETRY; -- ath_tx_rc_status(sc, bf, ts, 1, txok ? 0 : 1, txok, true); -+ ath_tx_rc_status(sc, bf, ts, 1, txok ? 0 : 1, txok); - ath_tx_complete_buf(sc, bf, txq, bf_head, ts, txok, 0); - } else - ath_tx_complete_aggr(sc, txq, bf, bf_head, ts, txok, true); + 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) + +@@ -659,6 +659,8 @@ ieee80211_tx_info_clear_status(struct ie + * @RX_FLAG_HT: HT MCS was used and rate_idx is MCS index + * @RX_FLAG_40MHZ: HT40 (40 MHz) was used + * @RX_FLAG_SHORT_GI: Short guard interval was used ++ * @RX_FLAG_NO_SIGNAL_VAL: The signal strength value is not present. ++ * Valid only for data frames (mainly A-MPDU) + */ + enum mac80211_rx_flags { + RX_FLAG_MMIC_ERROR = 1<<0, +@@ -672,6 +674,7 @@ enum mac80211_rx_flags { + RX_FLAG_HT = 1<<9, + RX_FLAG_40MHZ = 1<<10, + RX_FLAG_SHORT_GI = 1<<11, ++ RX_FLAG_NO_SIGNAL_VAL = 1<<12, + }; + + /** +@@ -1634,7 +1637,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 +1645,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 +2146,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 -@@ -180,6 +180,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); @@ -2122,45 +244,40 @@ IEEE80211_STYPE_ACTION); --- a/net/mac80211/agg-tx.c +++ b/net/mac80211/agg-tx.c -@@ -77,7 +77,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); -@@ -397,7 +398,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_ @@ -2171,7 +288,7 @@ 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); @@ -2184,8 +301,9 @@ - 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) { @@ -2199,17 +317,17 @@ /* * 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; } @@ -2262,14 +380,14 @@ + 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); + } @@ -2280,7 +398,7 @@ 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; @@ -2292,17 +410,62 @@ break; --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c -@@ -2163,7 +2163,8 @@ ieee80211_rx_h_action(struct ieee80211_r - */ - if (sdata->vif.type != NL80211_IFTYPE_STATION && +@@ -177,7 +177,8 @@ ieee80211_add_rx_radiotap_header(struct + pos += 2; + + /* IEEE80211_RADIOTAP_DBM_ANTSIGNAL */ +- if (local->hw.flags & IEEE80211_HW_SIGNAL_DBM) { ++ if (local->hw.flags & IEEE80211_HW_SIGNAL_DBM && ++ !(status->flag & RX_FLAG_NO_SIGNAL_VAL)) { + *pos = status->signal; + rthdr->it_present |= + cpu_to_le32(1 << IEEE80211_RADIOTAP_DBM_ANTSIGNAL); +@@ -489,12 +490,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; + } + } +@@ -1309,8 +1310,10 @@ ieee80211_rx_h_sta_process(struct ieee80 + + sta->rx_fragments++; + sta->rx_bytes += rx->skb->len; +- sta->last_signal = status->signal; +- ewma_add(&sta->avg_signal, -status->signal); ++ if (!(status->flag & RX_FLAG_NO_SIGNAL_VAL)) { ++ sta->last_signal = status->signal; ++ ewma_add(&sta->avg_signal, -status->signal); ++ } + + /* + * Change STA power saving mode only at the end of a frame +@@ -2282,6 +2285,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 */ -@@ -2378,13 +2379,14 @@ ieee80211_rx_h_mgmt(struct ieee80211_rx_ +@@ -2336,7 +2340,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 +2496,15 @@ ieee80211_rx_h_mgmt(struct ieee80211_rx_ if (!ieee80211_vif_is_mesh(&sdata->vif) && sdata->vif.type != NL80211_IFTYPE_ADHOC && @@ -2311,552 +474,1475 @@ + sdata->vif.type != NL80211_IFTYPE_WDS) return RX_DROP_MONITOR; - switch (stype) { - 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): -@@ -2727,10 +2729,16 @@ static int prepare_for_handlers(struct i + 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_ASSOC_RESP): + case cpu_to_le16(IEEE80211_STYPE_REASSOC_RESP): +@@ -2853,10 +2858,16 @@ static int prepare_for_handlers(struct i + } + break; + case NL80211_IFTYPE_WDS: +- if (bssid || !ieee80211_is_data(hdr->frame_control)) +- return 0; + if (compare_ether_addr(sdata->u.wds.remote_addr, hdr->addr2)) + return 0; ++ ++ if (ieee80211_is_data(hdr->frame_control) || ++ ieee80211_is_action(hdr->frame_control)) { ++ if (compare_ether_addr(sdata->vif.addr, hdr->addr1)) ++ return 0; ++ } else if (!ieee80211_is_beacon(hdr->frame_control)) ++ return 0; ++ + break; + default: + /* should never get here */ +--- a/net/mac80211/sta_info.c ++++ b/net/mac80211/sta_info.c +@@ -9,6 +9,7 @@ + + #include + #include ++#include + #include + #include + #include +@@ -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 +@@ -14,6 +14,7 @@ + #include + #include + #include ++#include + #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_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. +@@ -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) + + /* + * 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; ++ } ++ + #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); +@@ -1060,6 +1065,7 @@ static bool ieee80211_tx_prep_agg(struct + { + bool queued = false; + bool reset_agg_timer = false; ++ struct sk_buff *purge_skb = NULL; + + if (test_bit(HT_AGG_STATE_OPERATIONAL, &tid_tx->state)) { + info->flags |= IEEE80211_TX_CTL_AMPDU; +@@ -1101,8 +1107,13 @@ static bool ieee80211_tx_prep_agg(struct + info->control.vif = &tx->sdata->vif; + info->flags |= IEEE80211_TX_INTFL_NEED_TXPROCESSING; + __skb_queue_tail(&tid_tx->pending, skb); ++ if (skb_queue_len(&tid_tx->pending) > STA_MAX_TX_BUFFER) ++ purge_skb = __skb_dequeue(&tid_tx->pending); + } + spin_unlock(&tx->sta->lock); ++ ++ if (purge_skb) ++ dev_kfree_skb(purge_skb); + } + + /* reset session timer */ +--- a/net/mac80211/ieee80211_i.h ++++ b/net/mac80211/ieee80211_i.h +@@ -480,7 +480,7 @@ struct ieee80211_if_ibss { + + 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; + } + +--- a/net/mac80211/mesh_hwmp.c ++++ b/net/mac80211/mesh_hwmp.c +@@ -8,6 +8,7 @@ + */ + + #include ++#include + #include + #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; } - break; - case NL80211_IFTYPE_WDS: -- if (bssid || !ieee80211_is_data(hdr->frame_control)) -- return 0; - if (compare_ether_addr(sdata->u.wds.remote_addr, hdr->addr2)) - return 0; -+ -+ if (ieee80211_is_data(hdr->frame_control) || -+ ieee80211_is_action(hdr->frame_control)) { -+ if (compare_ether_addr(sdata->vif.addr, hdr->addr1)) -+ return 0; -+ } else if (!ieee80211_is_beacon(hdr->frame_control)) -+ return 0; -+ - break; - default: - /* should never get here */ ---- a/net/mac80211/sta_info.h -+++ b/net/mac80211/sta_info.h -@@ -31,7 +31,6 @@ - * 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, + } 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 -@@ -278,17 +278,19 @@ void ieee80211_tx_status(struct ieee8021 - } +@@ -10,6 +10,7 @@ + */ - if (!acked && ieee80211_is_back_req(fc)) { -+ u16 control; -+ - /* -- * BAR failed, let's tear down the BA session as a -- * last resort as some STAs (Intel 5100 on Windows) -- * can get stuck when the BA window isn't flushed -- * correctly. -+ * BAR failed, store the last SSN and retry sending -+ * the BAR when the next unicast transmission on the -+ * same TID succeeds. - */ - bar = (struct ieee80211_bar *) skb->data; -- if (!(bar->control & IEEE80211_BAR_CTRL_MULTI_TID)) { -+ control = le16_to_cpu(bar->control); -+ if (!(control & IEEE80211_BAR_CTRL_MULTI_TID)) { - u16 ssn = le16_to_cpu(bar->start_seq_num); + #include ++#include + #include + #include + #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; -- tid = (bar->control & -+ tid = (control & - IEEE80211_BAR_CTRL_TID_INFO_MASK) >> - IEEE80211_BAR_CTRL_TID_INFO_SHIFT; + if (info->flags & IEEE80211_TX_STATUS_EOSP) +--- a/net/wireless/mlme.c ++++ b/net/wireless/mlme.c +@@ -6,6 +6,7 @@ + + #include + #include ++#include + #include + #include + #include +@@ -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; ---- a/drivers/net/wireless/ath/ath9k/ar5008_phy.c -+++ b/drivers/net/wireless/ath/ath9k/ar5008_phy.c -@@ -704,8 +704,10 @@ static void ar5008_hw_override_ini(struc - REG_WRITE(ah, AR_PCU_MISC_MODE2, val); + 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 (!AR_SREV_5416_20_OR_LATER(ah) || -- AR_SREV_9280_20_OR_LATER(ah)) -+ REG_SET_BIT(ah, AR_PHY_CCK_DETECT, -+ AR_PHY_CCK_DETECT_BB_ENABLE_ANT_FAST_DIV); -+ -+ if (AR_SREV_9280_20_OR_LATER(ah)) - return; - /* - * Disable BB clock gating -@@ -802,7 +804,8 @@ static int ar5008_hw_process_ini(struct - - /* Write ADDAC shifts */ - REG_WRITE(ah, AR_PHY_ADC_SERIAL_CTL, AR_PHY_SEL_EXTERNAL_RADIO); -- ah->eep_ops->set_addac(ah, chan); -+ if (ah->eep_ops->set_addac) -+ ah->eep_ops->set_addac(ah, chan); - - if (AR_SREV_5416_22_OR_LATER(ah)) { - REG_WRITE_ARRAY(&ah->iniAddac, 1, regWrites); -@@ -1007,24 +1010,6 @@ static void ar5008_restore_chainmask(str +- 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 void ar5008_set_diversity(struct ath_hw *ah, bool value) --{ -- u32 v = REG_READ(ah, AR_PHY_CCK_DETECT); -- if (value) -- v |= AR_PHY_CCK_DETECT_BB_ENABLE_ANT_FAST_DIV; -- else -- v &= ~AR_PHY_CCK_DETECT_BB_ENABLE_ANT_FAST_DIV; -- REG_WRITE(ah, AR_PHY_CCK_DETECT, v); --} + 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 + } +@@ -942,27 +944,6 @@ static ssize_t read_file_recv(struct fil + PHY_ERR("HT-RATE ERR", ATH9K_PHYERR_HT_RATE_ILLEGAL); + + len += snprintf(buf + len, size - len, +- "%22s : %10d\n", "RSSI-CTL0", +- sc->debug.stats.rxstats.rs_rssi_ctl0); +- len += snprintf(buf + len, size - len, +- "%22s : %10d\n", "RSSI-CTL1", +- sc->debug.stats.rxstats.rs_rssi_ctl1); +- len += snprintf(buf + len, size - len, +- "%22s : %10d\n", "RSSI-CTL2", +- sc->debug.stats.rxstats.rs_rssi_ctl2); +- len += snprintf(buf + len, size - len, +- "%22s : %10d\n", "RSSI-EXT0", +- sc->debug.stats.rxstats.rs_rssi_ext0); +- len += snprintf(buf + len, size - len, +- "%22s : %10d\n", "RSSI-EXT1", +- sc->debug.stats.rxstats.rs_rssi_ext1); +- len += snprintf(buf + len, size - len, +- "%22s : %10d\n", "RSSI-EXT2", +- sc->debug.stats.rxstats.rs_rssi_ext2); +- len += snprintf(buf + len, size - len, +- "%22s : %10d\n", "Rx Antenna", +- sc->debug.stats.rxstats.rs_antenna); +- len += snprintf(buf + len, size - len, + "%22s : %10u\n", "RX-Pkts-All", + sc->debug.stats.rxstats.rx_pkts_all); + len += snprintf(buf + len, size - len, +@@ -1009,16 +990,7 @@ void ath_debug_stat_rx(struct ath_softc + RX_PHY_ERR_INC(rs->rs_phyerr); + } + +- sc->debug.stats.rxstats.rs_rssi_ctl0 = rs->rs_rssi_ctl0; +- sc->debug.stats.rxstats.rs_rssi_ctl1 = rs->rs_rssi_ctl1; +- sc->debug.stats.rxstats.rs_rssi_ctl2 = rs->rs_rssi_ctl2; - --static u32 ar9100_hw_compute_pll_control(struct ath_hw *ah, -- struct ath9k_channel *chan) --{ -- if (chan && IS_CHAN_5GHZ(chan)) -- return 0x1450; -- return 0x1458; --} +- sc->debug.stats.rxstats.rs_rssi_ext0 = rs->rs_rssi_ext0; +- sc->debug.stats.rxstats.rs_rssi_ext1 = rs->rs_rssi_ext1; +- sc->debug.stats.rxstats.rs_rssi_ext2 = rs->rs_rssi_ext2; - - static u32 ar9160_hw_compute_pll_control(struct ath_hw *ah, - struct ath9k_channel *chan) - { -@@ -1654,7 +1639,6 @@ void ar5008_hw_attach_phy_ops(struct ath - priv_ops->rfbus_req = ar5008_hw_rfbus_req; - priv_ops->rfbus_done = ar5008_hw_rfbus_done; - priv_ops->restore_chainmask = ar5008_restore_chainmask; -- priv_ops->set_diversity = ar5008_set_diversity; - priv_ops->do_getnf = ar5008_hw_do_getnf; - priv_ops->set_radar_params = ar5008_hw_set_radar_params; - -@@ -1664,9 +1648,7 @@ void ar5008_hw_attach_phy_ops(struct ath - } else - priv_ops->ani_control = ar5008_hw_ani_control_old; +- 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 +1007,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); -- if (AR_SREV_9100(ah)) -- priv_ops->compute_pll_control = ar9100_hw_compute_pll_control; -- else if (AR_SREV_9160_10_OR_LATER(ah)) -+ if (AR_SREV_9100(ah) || AR_SREV_9160_10_OR_LATER(ah)) - priv_ops->compute_pll_control = ar9160_hw_compute_pll_control; - else - priv_ops->compute_pll_control = ar5008_hw_compute_pll_control; ---- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c -+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c -@@ -592,6 +592,9 @@ static void ar9003_hw_override_ini(struc - val = REG_READ(ah, AR_PCU_MISC_MODE2) & (~AR_ADHOC_MCAST_KEYID_ENABLE); - REG_WRITE(ah, AR_PCU_MISC_MODE2, - val | AR_AGG_WEP_ENABLE_FIX | AR_AGG_WEP_ENABLE); ++#endif + -+ REG_SET_BIT(ah, AR_PHY_CCK_DETECT, -+ AR_PHY_CCK_DETECT_BB_ENABLE_ANT_FAST_DIV); - } + #undef RX_STAT_INC + #undef RX_PHY_ERR_INC + #undef RX_SAMP_DBG +@@ -1278,6 +1252,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 +1527,7 @@ static const struct file_operations fops + .llseek = default_llseek, + }; + ++#endif + + int ath9k_init_debug(struct ath_hw *ah) + { +@@ -1604,8 +1581,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 +@@ -165,13 +165,6 @@ struct ath_rx_stats { + u32 post_delim_crc_err; + u32 decrypt_busy_err; + u32 phy_err_stats[ATH9K_PHYERR_MAX]; +- int8_t rs_rssi_ctl0; +- int8_t rs_rssi_ctl1; +- int8_t rs_rssi_ctl2; +- int8_t rs_rssi_ext0; +- int8_t rs_rssi_ext1; +- int8_t rs_rssi_ext2; +- u8 rs_antenna; + }; + + enum ath_reset_type { +@@ -235,16 +228,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 + }; - static void ar9003_hw_prog_ini(struct ath_hw *ah, -@@ -785,16 +788,6 @@ static void ar9003_hw_rfbus_done(struct - REG_WRITE(ah, AR_PHY_RFBUS_REQ, 0); + 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 +252,6 @@ static inline int ath9k_init_debug(struc + return 0; } --static void ar9003_hw_set_diversity(struct ath_hw *ah, bool value) +-static inline void ath9k_debug_samp_bb_mac(struct ath_softc *sc) -{ -- u32 v = REG_READ(ah, AR_PHY_CCK_DETECT); -- if (value) -- v |= AR_PHY_CCK_DETECT_BB_ENABLE_ANT_FAST_DIV; -- else -- v &= ~AR_PHY_CCK_DETECT_BB_ENABLE_ANT_FAST_DIV; -- REG_WRITE(ah, AR_PHY_CCK_DETECT, v); -} - - static bool ar9003_hw_ani_control(struct ath_hw *ah, - enum ath9k_ani_cmd cmd, int param) + static inline void ath_debug_stat_interrupt(struct ath_softc *sc, + enum ath9k_int status) { -@@ -1277,7 +1270,6 @@ void ar9003_hw_attach_phy_ops(struct ath - priv_ops->set_delta_slope = ar9003_hw_set_delta_slope; - priv_ops->rfbus_req = ar9003_hw_rfbus_req; - priv_ops->rfbus_done = ar9003_hw_rfbus_done; -- priv_ops->set_diversity = ar9003_hw_set_diversity; - priv_ops->ani_control = ar9003_hw_ani_control; - priv_ops->do_getnf = ar9003_hw_do_getnf; - priv_ops->ani_cache_ini_regs = ar9003_hw_ani_cache_ini_regs; ---- a/drivers/net/wireless/ath/ath9k/eeprom.c -+++ b/drivers/net/wireless/ath/ath9k/eeprom.c -@@ -456,12 +456,7 @@ void ath9k_hw_get_gain_boundaries_pdadcs - pPdGainBoundaries[i] = - min((u16)MAX_RATE_POWER, pPdGainBoundaries[i]); - -- if ((i == 0) && !AR_SREV_5416_20_OR_LATER(ah)) { -- minDelta = pPdGainBoundaries[0] - 23; -- pPdGainBoundaries[0] = 23; -- } else { -- minDelta = 0; -- } -+ minDelta = 0; - - if (i == 0) { - if (AR_SREV_9280_20_OR_LATER(ah)) ---- a/drivers/net/wireless/ath/ath9k/eeprom_4k.c -+++ b/drivers/net/wireless/ath/ath9k/eeprom_4k.c -@@ -405,12 +405,7 @@ static void ath9k_hw_set_4k_power_cal_ta - REG_RMW_FIELD(ah, AR_PHY_TPCRG1, AR_PHY_TPCRG1_PD_GAIN_3, 0); - - for (i = 0; i < AR5416_EEP4K_MAX_CHAINS; i++) { -- if (AR_SREV_5416_20_OR_LATER(ah) && -- (ah->rxchainmask == 5 || ah->txchainmask == 5) && -- (i != 0)) { -- regChainOffset = (i == 1) ? 0x2000 : 0x1000; -- } else -- regChainOffset = i * 0x1000; -+ regChainOffset = i * 0x1000; - - if (pEepData->baseEepHeader.txMask & (1 << i)) { - pRawDataset = pEepData->calPierData2G[i]; -@@ -423,19 +418,17 @@ static void ath9k_hw_set_4k_power_cal_ta - - ENABLE_REGWRITE_BUFFER(ah); - -- if ((i == 0) || AR_SREV_5416_20_OR_LATER(ah)) { -- REG_WRITE(ah, AR_PHY_TPCRG5 + regChainOffset, -- SM(pdGainOverlap_t2, -- AR_PHY_TPCRG5_PD_GAIN_OVERLAP) -- | SM(gainBoundaries[0], -- AR_PHY_TPCRG5_PD_GAIN_BOUNDARY_1) -- | SM(gainBoundaries[1], -- AR_PHY_TPCRG5_PD_GAIN_BOUNDARY_2) -- | SM(gainBoundaries[2], -- AR_PHY_TPCRG5_PD_GAIN_BOUNDARY_3) -- | SM(gainBoundaries[3], -- AR_PHY_TPCRG5_PD_GAIN_BOUNDARY_4)); -- } -+ REG_WRITE(ah, AR_PHY_TPCRG5 + regChainOffset, -+ SM(pdGainOverlap_t2, -+ AR_PHY_TPCRG5_PD_GAIN_OVERLAP) -+ | SM(gainBoundaries[0], -+ AR_PHY_TPCRG5_PD_GAIN_BOUNDARY_1) -+ | SM(gainBoundaries[1], -+ AR_PHY_TPCRG5_PD_GAIN_BOUNDARY_2) -+ | SM(gainBoundaries[2], -+ AR_PHY_TPCRG5_PD_GAIN_BOUNDARY_3) -+ | SM(gainBoundaries[3], -+ AR_PHY_TPCRG5_PD_GAIN_BOUNDARY_4)); - - regOffset = AR_PHY_BASE + (672 << 2) + regChainOffset; - for (j = 0; j < 32; j++) { -@@ -715,10 +708,8 @@ static void ath9k_hw_4k_set_txpower(stru - if (test) - return; - -- if (AR_SREV_9280_20_OR_LATER(ah)) { -- for (i = 0; i < Ar5416RateSize; i++) -- ratesArray[i] -= AR5416_PWR_TABLE_OFFSET_DB * 2; -- } -+ for (i = 0; i < Ar5416RateSize; i++) -+ ratesArray[i] -= AR5416_PWR_TABLE_OFFSET_DB * 2; +@@ -282,4 +272,17 @@ static inline void ath_debug_stat_rx(str - ENABLE_REGWRITE_BUFFER(ah); + #endif /* CONFIG_ATH9K_DEBUGFS */ -@@ -788,28 +779,6 @@ static void ath9k_hw_4k_set_txpower(stru - REGWRITE_BUFFER_FLUSH(ah); - } ++#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); +--- a/drivers/net/wireless/ath/ath9k/hw.c ++++ b/drivers/net/wireless/ath/ath9k/hw.c +@@ -1386,10 +1386,16 @@ static bool ath9k_hw_set_reset_reg(struc + static bool ath9k_hw_chip_reset(struct ath_hw *ah, + struct ath9k_channel *chan) + { +- if (AR_SREV_9280(ah) && ah->eep_ops->get_eeprom(ah, EEP_OL_PWRCTRL)) { +- if (!ath9k_hw_set_reset_reg(ah, ATH9K_RESET_POWER_ON)) +- return false; +- } else if (!ath9k_hw_set_reset_reg(ah, ATH9K_RESET_WARM)) ++ int reset_type = ATH9K_RESET_WARM; ++ ++ if (AR_SREV_9280(ah)) { ++ if (ah->eep_ops->get_eeprom(ah, EEP_OL_PWRCTRL)) ++ reset_type = ATH9K_RESET_POWER_ON; ++ else ++ reset_type = ATH9K_RESET_COLD; ++ } ++ ++ if (!ath9k_hw_set_reset_reg(ah, reset_type)) + return false; --static void ath9k_hw_4k_set_addac(struct ath_hw *ah, -- struct ath9k_channel *chan) --{ -- struct modal_eep_4k_header *pModal; -- struct ar5416_eeprom_4k *eep = &ah->eeprom.map4k; -- u8 biaslevel; -- -- if (ah->hw_version.macVersion != AR_SREV_VERSION_9160) -- return; -- -- if (ah->eep_ops->get_eeprom_rev(ah) < AR5416_EEP_MINOR_VER_7) -- return; + if (!ath9k_hw_setpower(ah, ATH9K_PM_AWAKE)) +--- a/drivers/net/wireless/ath/ath5k/base.c ++++ b/drivers/net/wireless/ath/ath5k/base.c +@@ -2330,15 +2330,6 @@ ath5k_calibrate_work(struct work_struct + "got new rfgain, resetting\n"); + ieee80211_queue_work(ah->hw, &ah->reset_work); + } - -- pModal = &eep->modalHeader; +- /* TODO: On full calibration we should stop TX here, +- * so that it doesn't interfere (mostly due to gain_f +- * calibration that messes with tx packets -see phy.c). +- * +- * NOTE: Stopping the queues from above is not enough +- * to stop TX but saves us from disconecting (at least +- * we don't lose packets). */ +- ieee80211_stop_queues(ah->hw); + } else + ah->ah_cal_mask |= AR5K_CALIBRATION_SHORT; + +@@ -2353,10 +2344,9 @@ ath5k_calibrate_work(struct work_struct + ah->curchan->center_freq)); + + /* Clear calibration flags */ +- if (ah->ah_cal_mask & AR5K_CALIBRATION_FULL) { +- ieee80211_wake_queues(ah->hw); ++ if (ah->ah_cal_mask & AR5K_CALIBRATION_FULL) + ah->ah_cal_mask &= ~AR5K_CALIBRATION_FULL; +- } else if (ah->ah_cal_mask & AR5K_CALIBRATION_SHORT) ++ else if (ah->ah_cal_mask & AR5K_CALIBRATION_SHORT) + ah->ah_cal_mask &= ~AR5K_CALIBRATION_SHORT; + } + +--- a/drivers/net/wireless/ath/ath5k/phy.c ++++ b/drivers/net/wireless/ath/ath5k/phy.c +@@ -1871,31 +1871,15 @@ ath5k_hw_phy_calibrate(struct ath5k_hw * + ret = 0; + } + +- /* On full calibration do an AGC calibration and +- * request a PAPD probe for gainf calibration if +- * needed */ +- if (ah->ah_cal_mask & AR5K_CALIBRATION_FULL) { ++ /* On full calibration request a PAPD probe for ++ * gainf calibration if needed */ ++ if ((ah->ah_cal_mask & AR5K_CALIBRATION_FULL) && ++ (ah->ah_radio == AR5K_RF5111 || ++ ah->ah_radio == AR5K_RF5112) && ++ channel->hw_value != AR5K_MODE_11B) ++ ath5k_hw_request_rfgain_probe(ah); + +- AR5K_REG_ENABLE_BITS(ah, AR5K_PHY_AGCCTL, +- AR5K_PHY_AGCCTL_CAL); +- +- ret = ath5k_hw_register_timeout(ah, AR5K_PHY_AGCCTL, +- AR5K_PHY_AGCCTL_CAL | AR5K_PHY_AGCCTL_NF, +- 0, false); +- if (ret) { +- ATH5K_ERR(ah, +- "gain calibration timeout (%uMHz)\n", +- channel->center_freq); +- } - -- if (pModal->xpaBiasLvl != 0xff) { -- biaslevel = pModal->xpaBiasLvl; -- INI_RA(&ah->iniAddac, 7, 1) = -- (INI_RA(&ah->iniAddac, 7, 1) & (~0x18)) | biaslevel << 3; +- if ((ah->ah_radio == AR5K_RF5111 || +- ah->ah_radio == AR5K_RF5112) +- && (channel->hw_value != AR5K_MODE_11B)) +- ath5k_hw_request_rfgain_probe(ah); - } --} - - static void ath9k_hw_4k_set_gain(struct ath_hw *ah, - struct modal_eep_4k_header *pModal, - struct ar5416_eeprom_4k *eep, -@@ -877,6 +846,7 @@ static void ath9k_hw_4k_set_board_values - u8 txRxAttenLocal; - u8 ob[5], db1[5], db2[5]; - u8 ant_div_control1, ant_div_control2; -+ u8 bb_desired_scale; - u32 regVal; - - pModal = &eep->modalHeader; -@@ -1096,30 +1066,29 @@ static void ath9k_hw_4k_set_board_values - AR_PHY_SETTLING_SWITCH, - pModal->swSettleHt40); +- /* Update noise floor +- * XXX: Only do this after AGC calibration */ ++ /* Update noise floor */ + if (!(ah->ah_cal_mask & AR5K_CALIBRATION_NF)) + ath5k_hw_update_noise_floor(ah); + +--- a/drivers/net/wireless/ath/ath9k/recv.c ++++ b/drivers/net/wireless/ath/ath9k/recv.c +@@ -232,7 +232,6 @@ static void ath_rx_edma_cleanup(struct a + static void ath_rx_edma_init_queue(struct ath_rx_edma *rx_edma, int size) + { + skb_queue_head_init(&rx_edma->rx_fifo); +- skb_queue_head_init(&rx_edma->rx_buffers); + rx_edma->rx_fifo_hwsize = size; + } + +@@ -658,7 +657,9 @@ static void ath_rx_ps(struct ath_softc * + } + + static bool ath_edma_get_buffers(struct ath_softc *sc, +- enum ath9k_rx_qtype qtype) ++ enum ath9k_rx_qtype qtype, ++ struct ath_rx_status *rs, ++ struct ath_buf **dest) + { + struct ath_rx_edma *rx_edma = &sc->rx.rx_edma[qtype]; + struct ath_hw *ah = sc->sc_ah; +@@ -677,7 +678,7 @@ static bool ath_edma_get_buffers(struct + dma_sync_single_for_cpu(sc->dev, bf->bf_buf_addr, + common->rx_bufsize, DMA_FROM_DEVICE); + +- ret = ath9k_hw_process_rxdesc_edma(ah, NULL, skb->data); ++ ret = ath9k_hw_process_rxdesc_edma(ah, rs, skb->data); + if (ret == -EINPROGRESS) { + /*let device gain the buffer again*/ + dma_sync_single_for_device(sc->dev, bf->bf_buf_addr, +@@ -690,20 +691,21 @@ static bool ath_edma_get_buffers(struct + /* corrupt descriptor, skip this one and the following one */ + list_add_tail(&bf->list, &sc->rx.rxbuf); + ath_rx_edma_buf_link(sc, qtype); +- skb = skb_peek(&rx_edma->rx_fifo); +- if (!skb) +- return true; + +- bf = SKB_CB_ATHBUF(skb); +- BUG_ON(!bf); ++ skb = skb_peek(&rx_edma->rx_fifo); ++ if (skb) { ++ bf = SKB_CB_ATHBUF(skb); ++ BUG_ON(!bf); + +- __skb_unlink(skb, &rx_edma->rx_fifo); +- list_add_tail(&bf->list, &sc->rx.rxbuf); +- ath_rx_edma_buf_link(sc, qtype); +- return true; ++ __skb_unlink(skb, &rx_edma->rx_fifo); ++ list_add_tail(&bf->list, &sc->rx.rxbuf); ++ ath_rx_edma_buf_link(sc, qtype); ++ } else { ++ bf = NULL; ++ } } -- if (AR_SREV_9271(ah) || AR_SREV_9285(ah)) { -- u8 bb_desired_scale = (pModal->bb_scale_smrt_antenna & -- EEP_4K_BB_DESIRED_SCALE_MASK); -- if ((pBase->txGainType == 0) && (bb_desired_scale != 0)) { -- u32 pwrctrl, mask, clr; -- -- mask = BIT(0)|BIT(5)|BIT(10)|BIT(15)|BIT(20)|BIT(25); -- pwrctrl = mask * bb_desired_scale; -- clr = mask * 0x1f; -- REG_RMW(ah, AR_PHY_TX_PWRCTRL8, pwrctrl, clr); -- REG_RMW(ah, AR_PHY_TX_PWRCTRL10, pwrctrl, clr); -- REG_RMW(ah, AR_PHY_CH0_TX_PWRCTRL12, pwrctrl, clr); -- -- mask = BIT(0)|BIT(5)|BIT(15); -- pwrctrl = mask * bb_desired_scale; -- clr = mask * 0x1f; -- REG_RMW(ah, AR_PHY_TX_PWRCTRL9, pwrctrl, clr); +- skb_queue_tail(&rx_edma->rx_buffers, skb); + ++ *dest = bf; + return true; + } + +@@ -711,18 +713,15 @@ static struct ath_buf *ath_edma_get_next + struct ath_rx_status *rs, + enum ath9k_rx_qtype qtype) + { +- struct ath_rx_edma *rx_edma = &sc->rx.rx_edma[qtype]; +- struct sk_buff *skb; +- struct ath_buf *bf; ++ struct ath_buf *bf = NULL; + +- while (ath_edma_get_buffers(sc, qtype)); +- skb = __skb_dequeue(&rx_edma->rx_buffers); +- if (!skb) +- return NULL; ++ while (ath_edma_get_buffers(sc, qtype, rs, &bf)) { ++ if (!bf) ++ continue; + +- bf = SKB_CB_ATHBUF(skb); +- ath9k_hw_process_rxdesc_edma(sc->sc_ah, rs, skb->data); +- return bf; ++ return bf; ++ } ++ return NULL; + } + + static struct ath_buf *ath_get_next_rx_buf(struct ath_softc *sc, +@@ -954,6 +953,7 @@ static void ath9k_process_rssi(struct at + struct ath_softc *sc = hw->priv; + struct ath_hw *ah = common->ah; + int last_rssi; ++ int rssi = rx_stats->rs_rssi; + + if (!rx_stats->is_mybeacon || + ((ah->opmode != NL80211_IFTYPE_STATION) && +@@ -965,13 +965,12 @@ static void ath9k_process_rssi(struct at + + last_rssi = sc->last_rssi; + if (likely(last_rssi != ATH_RSSI_DUMMY_MARKER)) +- rx_stats->rs_rssi = ATH_EP_RND(last_rssi, +- ATH_RSSI_EP_MULTIPLIER); +- if (rx_stats->rs_rssi < 0) +- rx_stats->rs_rssi = 0; ++ rssi = ATH_EP_RND(last_rssi, ATH_RSSI_EP_MULTIPLIER); ++ if (rssi < 0) ++ rssi = 0; + + /* Update Beacon RSSI, this is used by ANI. */ +- ah->stats.avgbrssi = rx_stats->rs_rssi; ++ ah->stats.avgbrssi = rssi; + } + + /* +@@ -988,8 +987,6 @@ static int ath9k_rx_skb_preprocess(struc + { + struct ath_hw *ah = common->ah; + +- memset(rx_status, 0, sizeof(struct ieee80211_rx_status)); - -- mask = BIT(0)|BIT(5); -- pwrctrl = mask * bb_desired_scale; -- clr = mask * 0x1f; -- REG_RMW(ah, AR_PHY_CH0_TX_PWRCTRL11, pwrctrl, clr); -- REG_RMW(ah, AR_PHY_CH0_TX_PWRCTRL13, pwrctrl, clr); -- } + /* + * everything but the rate is checked here, the rate check is done + * separately to avoid doing two lookups for a rate for each frame. +@@ -1011,6 +1008,8 @@ static int ath9k_rx_skb_preprocess(struc + rx_status->signal = ah->noise + rx_stats->rs_rssi; + rx_status->antenna = rx_stats->rs_antenna; + rx_status->flag |= RX_FLAG_MACTIME_MPDU; ++ if (rx_stats->rs_moreaggr) ++ rx_status->flag |= RX_FLAG_NO_SIGNAL_VAL; + + return 0; + } +@@ -1845,6 +1844,8 @@ int ath_rx_tasklet(struct ath_softc *sc, + if (sc->sc_flags & SC_OP_RXFLUSH) + goto requeue_drop_frag; + ++ memset(rxs, 0, sizeof(struct ieee80211_rx_status)); + -+ bb_desired_scale = (pModal->bb_scale_smrt_antenna & -+ EEP_4K_BB_DESIRED_SCALE_MASK); -+ if ((pBase->txGainType == 0) && (bb_desired_scale != 0)) { -+ u32 pwrctrl, mask, clr; + rxs->mactime = (tsf & ~0xffffffffULL) | rs.rs_tstamp; + if (rs.rs_tstamp > tsf_lower && + unlikely(rs.rs_tstamp - tsf_lower > 0x10000000)) +--- a/drivers/net/wireless/ath/ath9k/beacon.c ++++ b/drivers/net/wireless/ath/ath9k/beacon.c +@@ -91,7 +91,7 @@ static void ath_beacon_setup(struct ath_ + info.txpower = MAX_RATE_POWER; + info.keyix = ATH9K_TXKEYIX_INVALID; + info.keytype = ATH9K_KEY_TYPE_CLEAR; +- info.flags = ATH9K_TXDESC_NOACK; ++ info.flags = ATH9K_TXDESC_NOACK | ATH9K_TXDESC_INTREQ; + + info.buf_addr[0] = bf->bf_buf_addr; + info.buf_len[0] = roundup(skb->len, 4); +@@ -355,7 +355,6 @@ void ath_beacon_tasklet(unsigned long da + struct ath_common *common = ath9k_hw_common(ah); + struct ath_buf *bf = NULL; + struct ieee80211_vif *vif; +- struct ath_tx_status ts; + bool edma = !!(ah->caps.hw_caps & ATH9K_HW_CAP_EDMA); + int slot; + u32 bfaddr, bc = 0; +@@ -462,11 +461,6 @@ void ath_beacon_tasklet(unsigned long da + ath9k_hw_txstart(ah, sc->beacon.beaconq); + + sc->beacon.ast_be_xmit += bc; /* XXX per-vif? */ +- if (edma) { +- spin_lock_bh(&sc->sc_pcu_lock); +- ath9k_hw_txprocdesc(ah, bf->bf_desc, (void *)&ts); +- spin_unlock_bh(&sc->sc_pcu_lock); +- } + } + } + +--- a/drivers/net/wireless/ath/ath9k/mac.c ++++ b/drivers/net/wireless/ath/ath9k/mac.c +@@ -745,7 +745,11 @@ int ath9k_hw_beaconq_setup(struct ath_hw + qi.tqi_aifs = 1; + qi.tqi_cwmin = 0; + qi.tqi_cwmax = 0; +- /* NB: don't enable any interrupts */ + -+ mask = BIT(0)|BIT(5)|BIT(10)|BIT(15)|BIT(20)|BIT(25); -+ pwrctrl = mask * bb_desired_scale; -+ clr = mask * 0x1f; -+ REG_RMW(ah, AR_PHY_TX_PWRCTRL8, pwrctrl, clr); -+ REG_RMW(ah, AR_PHY_TX_PWRCTRL10, pwrctrl, clr); -+ REG_RMW(ah, AR_PHY_CH0_TX_PWRCTRL12, pwrctrl, clr); ++ if (ah->caps.hw_caps & ATH9K_HW_CAP_EDMA) ++ qi.tqi_qflags = TXQ_FLAG_TXOKINT_ENABLE | ++ TXQ_FLAG_TXERRINT_ENABLE; + -+ mask = BIT(0)|BIT(5)|BIT(15); -+ pwrctrl = mask * bb_desired_scale; -+ clr = mask * 0x1f; -+ REG_RMW(ah, AR_PHY_TX_PWRCTRL9, pwrctrl, clr); + return ath9k_hw_setuptxqueue(ah, ATH9K_TX_QUEUE_BEACON, &qi); + } + EXPORT_SYMBOL(ath9k_hw_beaconq_setup); +--- a/drivers/net/wireless/ath/ath9k/main.c ++++ b/drivers/net/wireless/ath/ath9k/main.c +@@ -118,13 +118,15 @@ void ath9k_ps_restore(struct ath_softc * + if (--sc->ps_usecount != 0) + goto unlock; + +- if (sc->ps_idle && (sc->ps_flags & PS_WAIT_FOR_TX_ACK)) ++ if (sc->ps_flags & PS_WAIT_FOR_TX_ACK) ++ goto unlock; + -+ mask = BIT(0)|BIT(5); -+ pwrctrl = mask * bb_desired_scale; -+ clr = mask * 0x1f; -+ REG_RMW(ah, AR_PHY_CH0_TX_PWRCTRL11, pwrctrl, clr); -+ REG_RMW(ah, AR_PHY_CH0_TX_PWRCTRL13, pwrctrl, clr); ++ if (sc->ps_idle) + mode = ATH9K_PM_FULL_SLEEP; + else if (sc->ps_enabled && + !(sc->ps_flags & (PS_WAIT_FOR_BEACON | + PS_WAIT_FOR_CAB | +- PS_WAIT_FOR_PSPOLL_DATA | +- PS_WAIT_FOR_TX_ACK))) ++ PS_WAIT_FOR_PSPOLL_DATA))) + mode = ATH9K_PM_NETWORK_SLEEP; + else + goto unlock; +@@ -1955,6 +1957,7 @@ static void ath9k_config_bss(struct ath_ + sc->sc_flags &= ~SC_OP_ANI_RUN; + del_timer_sync(&common->ani.timer); + memset(&sc->caldata, 0, sizeof(sc->caldata)); ++ ath9k_hw_ani_init(sc->sc_ah); } } -@@ -1161,7 +1130,6 @@ const struct eeprom_ops eep_4k_ops = { - .get_eeprom_ver = ath9k_hw_4k_get_eeprom_ver, - .get_eeprom_rev = ath9k_hw_4k_get_eeprom_rev, - .set_board_values = ath9k_hw_4k_set_board_values, -- .set_addac = ath9k_hw_4k_set_addac, - .set_txpower = ath9k_hw_4k_set_txpower, - .get_spur_channel = ath9k_hw_4k_get_spur_channel - }; ---- a/drivers/net/wireless/ath/ath9k/eeprom_9287.c -+++ b/drivers/net/wireless/ath/ath9k/eeprom_9287.c -@@ -851,10 +851,8 @@ static void ath9k_hw_ar9287_set_txpower( - if (test) - return; - -- if (AR_SREV_9280_20_OR_LATER(ah)) { -- for (i = 0; i < Ar5416RateSize; i++) -- ratesArray[i] -= AR9287_PWR_TABLE_OFFSET_DB * 2; -- } -+ for (i = 0; i < Ar5416RateSize; i++) -+ ratesArray[i] -= AR9287_PWR_TABLE_OFFSET_DB * 2; +@@ -2300,6 +2303,7 @@ static int ath9k_tx_last_beacon(struct i + struct ath_vif *avp; + struct ath_buf *bf; + struct ath_tx_status ts; ++ bool edma = !!(ah->caps.hw_caps & ATH9K_HW_CAP_EDMA); + int status; - ENABLE_REGWRITE_BUFFER(ah); + vif = sc->beacon.bslot[0]; +@@ -2310,7 +2314,7 @@ static int ath9k_tx_last_beacon(struct i + if (!avp->is_bslot_active) + return 0; -@@ -944,11 +942,6 @@ static void ath9k_hw_ar9287_set_txpower( - REGWRITE_BUFFER_FLUSH(ah); - } +- if (!sc->beacon.tx_processed) { ++ if (!sc->beacon.tx_processed && !edma) { + tasklet_disable(&sc->bcon_tasklet); --static void ath9k_hw_ar9287_set_addac(struct ath_hw *ah, -- struct ath9k_channel *chan) --{ --} -- - static void ath9k_hw_ar9287_set_board_values(struct ath_hw *ah, - struct ath9k_channel *chan) - { -@@ -1100,7 +1093,6 @@ const struct eeprom_ops eep_ar9287_ops = - .get_eeprom_ver = ath9k_hw_ar9287_get_eeprom_ver, - .get_eeprom_rev = ath9k_hw_ar9287_get_eeprom_rev, - .set_board_values = ath9k_hw_ar9287_set_board_values, -- .set_addac = ath9k_hw_ar9287_set_addac, - .set_txpower = ath9k_hw_ar9287_set_txpower, - .get_spur_channel = ath9k_hw_ar9287_get_spur_channel - }; ---- a/drivers/net/wireless/ath/ath9k/eeprom_def.c -+++ b/drivers/net/wireless/ath/ath9k/eeprom_def.c -@@ -547,8 +547,7 @@ static void ath9k_hw_def_set_board_value - break; + bf = avp->av_bcbuf; +--- a/drivers/net/wireless/ath/ath9k/xmit.c ++++ b/drivers/net/wireless/ath/ath9k/xmit.c +@@ -2296,9 +2296,12 @@ void ath_tx_edma_tasklet(struct ath_soft + break; } -- if (AR_SREV_5416_20_OR_LATER(ah) && -- (ah->rxchainmask == 5 || ah->txchainmask == 5) && (i != 0)) -+ if ((ah->rxchainmask == 5 || ah->txchainmask == 5) && (i != 0)) - regChainOffset = (i == 1) ? 0x2000 : 0x1000; - else - regChainOffset = i * 0x1000; -@@ -565,9 +564,8 @@ static void ath9k_hw_def_set_board_value - SM(pModal->iqCalQCh[i], - AR_PHY_TIMING_CTRL4_IQCORR_Q_Q_COFF)); - -- if ((i == 0) || AR_SREV_5416_20_OR_LATER(ah)) -- ath9k_hw_def_set_gain(ah, pModal, eep, txRxAttenLocal, -- regChainOffset, i); -+ ath9k_hw_def_set_gain(ah, pModal, eep, txRxAttenLocal, -+ regChainOffset, i); - } - - if (AR_SREV_9280_20_OR_LATER(ah)) { -@@ -893,8 +891,7 @@ static void ath9k_hw_set_def_power_cal_t - xpdGainValues[2]); - - for (i = 0; i < AR5416_MAX_CHAINS; i++) { -- if (AR_SREV_5416_20_OR_LATER(ah) && -- (ah->rxchainmask == 5 || ah->txchainmask == 5) && -+ if ((ah->rxchainmask == 5 || ah->txchainmask == 5) && - (i != 0)) { - regChainOffset = (i == 1) ? 0x2000 : 0x1000; - } else -@@ -935,27 +932,24 @@ static void ath9k_hw_set_def_power_cal_t - - ENABLE_REGWRITE_BUFFER(ah); - -- if ((i == 0) || AR_SREV_5416_20_OR_LATER(ah)) { -- if (OLC_FOR_AR9280_20_LATER) { -- REG_WRITE(ah, -- AR_PHY_TPCRG5 + regChainOffset, -- SM(0x6, -- AR_PHY_TPCRG5_PD_GAIN_OVERLAP) | -- SM_PD_GAIN(1) | SM_PD_GAIN(2) | -- SM_PD_GAIN(3) | SM_PD_GAIN(4)); -- } else { -- REG_WRITE(ah, -- AR_PHY_TPCRG5 + regChainOffset, -- SM(pdGainOverlap_t2, -- AR_PHY_TPCRG5_PD_GAIN_OVERLAP)| -- SM_PDGAIN_B(0, 1) | -- SM_PDGAIN_B(1, 2) | -- SM_PDGAIN_B(2, 3) | -- SM_PDGAIN_B(3, 4)); -- } -+ if (OLC_FOR_AR9280_20_LATER) { -+ REG_WRITE(ah, -+ AR_PHY_TPCRG5 + regChainOffset, -+ SM(0x6, -+ AR_PHY_TPCRG5_PD_GAIN_OVERLAP) | -+ SM_PD_GAIN(1) | SM_PD_GAIN(2) | -+ SM_PD_GAIN(3) | SM_PD_GAIN(4)); -+ } else { -+ REG_WRITE(ah, -+ AR_PHY_TPCRG5 + regChainOffset, -+ SM(pdGainOverlap_t2, -+ AR_PHY_TPCRG5_PD_GAIN_OVERLAP)| -+ SM_PDGAIN_B(0, 1) | -+ SM_PDGAIN_B(1, 2) | -+ SM_PDGAIN_B(2, 3) | -+ SM_PDGAIN_B(3, 4)); - } +- /* Skip beacon completions */ +- if (ts.qid == sc->beacon.beaconq) ++ /* Process beacon completions separately */ ++ if (ts.qid == sc->beacon.beaconq) { ++ sc->beacon.tx_processed = true; ++ sc->beacon.tx_last = !(ts.ts_status & ATH9K_TXERR_MASK); + continue; ++ } -- - ath9k_adjust_pdadc_values(ah, pwr_table_offset, - diff, pdadcValues); + txq = &sc->tx.txq[ts.qid]; ---- a/drivers/net/wireless/ath/ath9k/init.c -+++ b/drivers/net/wireless/ath/ath9k/init.c -@@ -506,7 +506,6 @@ static void ath9k_init_misc(struct ath_s - sc->sc_flags |= SC_OP_RXAGGR; - } +--- a/drivers/net/wireless/ath/ath9k/ath9k.h ++++ b/drivers/net/wireless/ath/ath9k/ath9k.h +@@ -299,7 +299,6 @@ struct ath_tx { -- ath9k_hw_set_diversity(sc->sc_ah, true); - sc->rx.defant = ath9k_hw_getdefantenna(sc->sc_ah); - - memcpy(common->bssidmask, ath_bcast_mac, ETH_ALEN); ---- a/drivers/net/wireless/ath/ath9k/reg.h -+++ b/drivers/net/wireless/ath/ath9k/reg.h -@@ -800,10 +800,6 @@ - #define AR_SREV_5416(_ah) \ - (((_ah)->hw_version.macVersion == AR_SREV_VERSION_5416_PCI) || \ - ((_ah)->hw_version.macVersion == AR_SREV_VERSION_5416_PCIE)) --#define AR_SREV_5416_20_OR_LATER(_ah) \ -- (((AR_SREV_5416(_ah)) && \ -- ((_ah)->hw_version.macRev >= AR_SREV_REVISION_5416_20)) || \ -- ((_ah)->hw_version.macVersion >= AR_SREV_VERSION_9100)) - #define AR_SREV_5416_22_OR_LATER(_ah) \ - (((AR_SREV_5416(_ah)) && \ - ((_ah)->hw_version.macRev >= AR_SREV_REVISION_5416_22)) || \ ---- a/drivers/net/wireless/ath/ath9k/ar9002_calib.c -+++ b/drivers/net/wireless/ath/ath9k/ar9002_calib.c -@@ -869,6 +869,7 @@ static bool ar9002_hw_init_cal(struct at - ar9002_hw_pa_cal(ah, true); - - /* Do NF Calibration after DC offset and other calibrations */ -+ ath9k_hw_loadnf(ah, chan); - ath9k_hw_start_nfcal(ah, true); - - if (ah->caldata) ---- a/net/mac80211/ieee80211_i.h -+++ b/net/mac80211/ieee80211_i.h -@@ -671,7 +671,6 @@ enum queue_stop_reason { - IEEE80211_QUEUE_STOP_REASON_AGGREGATION, - IEEE80211_QUEUE_STOP_REASON_SUSPEND, - IEEE80211_QUEUE_STOP_REASON_SKB_ADD, -- IEEE80211_QUEUE_STOP_REASON_CHTYPE_CHANGE, + struct ath_rx_edma { + struct sk_buff_head rx_fifo; +- struct sk_buff_head rx_buffers; + u32 rx_fifo_hwsize; }; - #ifdef CONFIG_MAC80211_LEDS ---- a/net/mac80211/mlme.c -+++ b/net/mac80211/mlme.c -@@ -1921,24 +1921,8 @@ static void ieee80211_rx_mgmt_beacon(str - - rcu_read_unlock(); +--- a/drivers/net/wireless/ath/ath9k/ani.c ++++ b/drivers/net/wireless/ath/ath9k/ani.c +@@ -46,8 +46,8 @@ static const struct ani_ofdm_level_entry + { 5, 4, 1 }, /* lvl 5 */ + { 6, 5, 1 }, /* lvl 6 */ + { 7, 6, 1 }, /* lvl 7 */ +- { 7, 7, 1 }, /* lvl 8 */ +- { 7, 8, 0 } /* lvl 9 */ ++ { 7, 6, 0 }, /* lvl 8 */ ++ { 7, 7, 0 } /* lvl 9 */ + }; + #define ATH9K_ANI_OFDM_NUM_LEVEL \ + ARRAY_SIZE(ofdm_level_table) +@@ -91,8 +91,8 @@ static const struct ani_cck_level_entry + { 4, 0 }, /* lvl 4 */ + { 5, 0 }, /* lvl 5 */ + { 6, 0 }, /* lvl 6 */ +- { 7, 0 }, /* lvl 7 (only for high rssi) */ +- { 8, 0 } /* lvl 8 (only for high rssi) */ ++ { 6, 0 }, /* lvl 7 (only for high rssi) */ ++ { 7, 0 } /* lvl 8 (only for high rssi) */ + }; + #define ATH9K_ANI_CCK_NUM_LEVEL \ +@@ -290,16 +290,9 @@ static void ath9k_hw_set_ofdm_nil(struct + ATH9K_ANI_FIRSTEP_LEVEL, + entry_ofdm->fir_step_level); + +- if ((ah->opmode != NL80211_IFTYPE_STATION && +- ah->opmode != NL80211_IFTYPE_ADHOC) || +- aniState->noiseFloor <= aniState->rssiThrHigh) { +- if (aniState->ofdmWeakSigDetectOff) +- /* force on ofdm weak sig detect */ +- ath9k_hw_ani_control(ah, +- ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION, +- true); +- else if (aniState->ofdmWeakSigDetectOff == +- entry_ofdm->ofdm_weak_signal_on) ++ if ((aniState->noiseFloor >= aniState->rssiThrHigh) && ++ (aniState->ofdmWeakSigDetectOff != ++ entry_ofdm->ofdm_weak_signal_on)) { + ath9k_hw_ani_control(ah, + ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION, + entry_ofdm->ofdm_weak_signal_on); +@@ -717,26 +710,30 @@ void ath9k_hw_ani_monitor(struct ath_hw + ofdmPhyErrRate, aniState->cckNoiseImmunityLevel, + cckPhyErrRate, aniState->ofdmsTurn); + +- if (aniState->listenTime > 5 * ah->aniperiod) { +- if (ofdmPhyErrRate <= ah->config.ofdm_trig_low && +- cckPhyErrRate <= ah->config.cck_trig_low) { ++ if (aniState->listenTime > ah->aniperiod) { ++ if (cckPhyErrRate < ah->config.cck_trig_low && ++ ((ofdmPhyErrRate < ah->config.ofdm_trig_low && ++ aniState->ofdmNoiseImmunityLevel < ++ ATH9K_ANI_OFDM_DEF_LEVEL) || ++ (ofdmPhyErrRate < ATH9K_ANI_OFDM_TRIG_LOW_ABOVE_INI && ++ aniState->ofdmNoiseImmunityLevel >= ++ ATH9K_ANI_OFDM_DEF_LEVEL))) { + ath9k_hw_ani_lower_immunity(ah); + aniState->ofdmsTurn = !aniState->ofdmsTurn; +- } +- ath9k_ani_restart(ah); +- } else if (aniState->listenTime > ah->aniperiod) { +- /* check to see if need to raise immunity */ +- if (ofdmPhyErrRate > ah->config.ofdm_trig_high && +- (cckPhyErrRate <= ah->config.cck_trig_high || +- aniState->ofdmsTurn)) { ++ } else if ((ofdmPhyErrRate > ah->config.ofdm_trig_high && ++ aniState->ofdmNoiseImmunityLevel >= ++ ATH9K_ANI_OFDM_DEF_LEVEL) || ++ (ofdmPhyErrRate > ++ ATH9K_ANI_OFDM_TRIG_HIGH_BELOW_INI && ++ aniState->ofdmNoiseImmunityLevel < ++ ATH9K_ANI_OFDM_DEF_LEVEL)) { + ath9k_hw_ani_ofdm_err_trigger(ah); +- ath9k_ani_restart(ah); + aniState->ofdmsTurn = false; + } else if (cckPhyErrRate > ah->config.cck_trig_high) { + ath9k_hw_ani_cck_err_trigger(ah); +- ath9k_ani_restart(ah); + aniState->ofdmsTurn = true; + } ++ ath9k_ani_restart(ah); + } + } + EXPORT_SYMBOL(ath9k_hw_ani_monitor); +@@ -911,3 +908,4 @@ void ath9k_hw_ani_init(struct ath_hw *ah + ath9k_ani_restart(ah); + ath9k_enable_mib_counters(ah); + } ++EXPORT_SYMBOL(ath9k_hw_ani_init); +--- a/drivers/net/wireless/ath/ath9k/ani.h ++++ b/drivers/net/wireless/ath/ath9k/ani.h +@@ -25,11 +25,13 @@ + + /* units are errors per second */ + #define ATH9K_ANI_OFDM_TRIG_HIGH_OLD 500 +-#define ATH9K_ANI_OFDM_TRIG_HIGH_NEW 1000 ++#define ATH9K_ANI_OFDM_TRIG_HIGH_NEW 3500 ++#define ATH9K_ANI_OFDM_TRIG_HIGH_BELOW_INI 1000 + + /* units are errors per second */ + #define ATH9K_ANI_OFDM_TRIG_LOW_OLD 200 + #define ATH9K_ANI_OFDM_TRIG_LOW_NEW 400 ++#define ATH9K_ANI_OFDM_TRIG_LOW_ABOVE_INI 900 + + /* units are errors per second */ + #define ATH9K_ANI_CCK_TRIG_HIGH_OLD 200 +@@ -53,7 +55,7 @@ + #define ATH9K_ANI_RSSI_THR_LOW 7 + + #define ATH9K_ANI_PERIOD_OLD 100 +-#define ATH9K_ANI_PERIOD_NEW 1000 ++#define ATH9K_ANI_PERIOD_NEW 300 + + /* in ms */ + #define ATH9K_ANI_POLLINTERVAL_OLD 100 +--- a/drivers/net/wireless/ath/ath9k/ar5008_phy.c ++++ b/drivers/net/wireless/ath/ath9k/ar5008_phy.c +@@ -1056,46 +1056,8 @@ static bool ar5008_hw_ani_control_old(st + break; + } + case ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION:{ +- static const int m1ThreshLow[] = { 127, 50 }; +- static const int m2ThreshLow[] = { 127, 40 }; +- static const int m1Thresh[] = { 127, 0x4d }; +- static const int m2Thresh[] = { 127, 0x40 }; +- static const int m2CountThr[] = { 31, 16 }; +- static const int m2CountThrLow[] = { 63, 48 }; + u32 on = param ? 1 : 0; + +- REG_RMW_FIELD(ah, AR_PHY_SFCORR_LOW, +- AR_PHY_SFCORR_LOW_M1_THRESH_LOW, +- m1ThreshLow[on]); +- REG_RMW_FIELD(ah, AR_PHY_SFCORR_LOW, +- AR_PHY_SFCORR_LOW_M2_THRESH_LOW, +- m2ThreshLow[on]); +- REG_RMW_FIELD(ah, AR_PHY_SFCORR, +- AR_PHY_SFCORR_M1_THRESH, +- m1Thresh[on]); +- REG_RMW_FIELD(ah, AR_PHY_SFCORR, +- AR_PHY_SFCORR_M2_THRESH, +- m2Thresh[on]); +- REG_RMW_FIELD(ah, AR_PHY_SFCORR, +- AR_PHY_SFCORR_M2COUNT_THR, +- m2CountThr[on]); +- REG_RMW_FIELD(ah, AR_PHY_SFCORR_LOW, +- AR_PHY_SFCORR_LOW_M2COUNT_THR_LOW, +- m2CountThrLow[on]); +- +- REG_RMW_FIELD(ah, AR_PHY_SFCORR_EXT, +- AR_PHY_SFCORR_EXT_M1_THRESH_LOW, +- m1ThreshLow[on]); +- REG_RMW_FIELD(ah, AR_PHY_SFCORR_EXT, +- AR_PHY_SFCORR_EXT_M2_THRESH_LOW, +- m2ThreshLow[on]); +- REG_RMW_FIELD(ah, AR_PHY_SFCORR_EXT, +- AR_PHY_SFCORR_EXT_M1_THRESH, +- m1Thresh[on]); +- REG_RMW_FIELD(ah, AR_PHY_SFCORR_EXT, +- AR_PHY_SFCORR_EXT_M2_THRESH, +- m2Thresh[on]); +- + if (on) + REG_SET_BIT(ah, AR_PHY_SFCORR_LOW, + AR_PHY_SFCORR_LOW_USE_SELF_CORR_LOW); +--- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c ++++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c +@@ -824,55 +824,6 @@ static bool ar9003_hw_ani_control(struct + * on == 0 means more noise imm + */ + u32 on = param ? 1 : 0; - /* -- * Whenever the AP announces the HT mode change that can be -- * 40MHz intolerant or etc., it would be safer to stop tx -- * queues before doing hw config to avoid buffer overflow. +- * make register setting for default +- * (weak sig detect ON) come from INI file - */ -- ieee80211_stop_queues_by_reason(&sdata->local->hw, -- IEEE80211_QUEUE_STOP_REASON_CHTYPE_CHANGE); -- -- /* flush out all packets */ -- synchronize_net(); -- -- drv_flush(local, false); -- - changed |= ieee80211_enable_ht(sdata, elems.ht_info_elem, - bssid, ap_ht_cap_flags); -- -- ieee80211_wake_queues_by_reason(&sdata->local->hw, -- IEEE80211_QUEUE_STOP_REASON_CHTYPE_CHANGE); - } +- int m1ThreshLow = on ? +- aniState->iniDef.m1ThreshLow : m1ThreshLow_off; +- int m2ThreshLow = on ? +- aniState->iniDef.m2ThreshLow : m2ThreshLow_off; +- int m1Thresh = on ? +- aniState->iniDef.m1Thresh : m1Thresh_off; +- int m2Thresh = on ? +- aniState->iniDef.m2Thresh : m2Thresh_off; +- int m2CountThr = on ? +- aniState->iniDef.m2CountThr : m2CountThr_off; +- int m2CountThrLow = on ? +- aniState->iniDef.m2CountThrLow : m2CountThrLow_off; +- int m1ThreshLowExt = on ? +- aniState->iniDef.m1ThreshLowExt : m1ThreshLowExt_off; +- int m2ThreshLowExt = on ? +- aniState->iniDef.m2ThreshLowExt : m2ThreshLowExt_off; +- int m1ThreshExt = on ? +- aniState->iniDef.m1ThreshExt : m1ThreshExt_off; +- int m2ThreshExt = on ? +- aniState->iniDef.m2ThreshExt : m2ThreshExt_off; +- +- REG_RMW_FIELD(ah, AR_PHY_SFCORR_LOW, +- AR_PHY_SFCORR_LOW_M1_THRESH_LOW, +- m1ThreshLow); +- REG_RMW_FIELD(ah, AR_PHY_SFCORR_LOW, +- AR_PHY_SFCORR_LOW_M2_THRESH_LOW, +- m2ThreshLow); +- REG_RMW_FIELD(ah, AR_PHY_SFCORR, +- AR_PHY_SFCORR_M1_THRESH, m1Thresh); +- REG_RMW_FIELD(ah, AR_PHY_SFCORR, +- AR_PHY_SFCORR_M2_THRESH, m2Thresh); +- REG_RMW_FIELD(ah, AR_PHY_SFCORR, +- AR_PHY_SFCORR_M2COUNT_THR, m2CountThr); +- REG_RMW_FIELD(ah, AR_PHY_SFCORR_LOW, +- AR_PHY_SFCORR_LOW_M2COUNT_THR_LOW, +- m2CountThrLow); +- +- REG_RMW_FIELD(ah, AR_PHY_SFCORR_EXT, +- AR_PHY_SFCORR_EXT_M1_THRESH_LOW, m1ThreshLowExt); +- REG_RMW_FIELD(ah, AR_PHY_SFCORR_EXT, +- AR_PHY_SFCORR_EXT_M2_THRESH_LOW, m2ThreshLowExt); +- REG_RMW_FIELD(ah, AR_PHY_SFCORR_EXT, +- AR_PHY_SFCORR_EXT_M1_THRESH, m1ThreshExt); +- REG_RMW_FIELD(ah, AR_PHY_SFCORR_EXT, +- AR_PHY_SFCORR_EXT_M2_THRESH, m2ThreshExt); + + if (on) + REG_SET_BIT(ah, AR_PHY_SFCORR_LOW, +--- a/drivers/net/wireless/rt2x00/rt2x00dev.c ++++ b/drivers/net/wireless/rt2x00/rt2x00dev.c +@@ -430,10 +430,14 @@ void rt2x00lib_txdone(struct queue_entry + /* + * If the data queue was below the threshold before the txdone + * handler we must make sure the packet queue in the mac80211 stack +- * is reenabled when the txdone handler has finished. ++ * is reenabled when the txdone handler has finished. This has to be ++ * serialized with rt2x00mac_tx(), otherwise we can wake up queue ++ * before it was stopped. + */ ++ spin_lock_bh(&entry->queue->tx_lock); + if (!rt2x00queue_threshold(entry->queue)) + rt2x00queue_unpause_queue(entry->queue); ++ spin_unlock_bh(&entry->queue->tx_lock); + } + EXPORT_SYMBOL_GPL(rt2x00lib_txdone); - /* Note: country IE parsing is done for us by cfg80211 */ ---- a/drivers/net/wireless/b43/main.c -+++ b/drivers/net/wireless/b43/main.c -@@ -1613,7 +1613,8 @@ static void handle_irq_beacon(struct b43 - u32 cmd, beacon0_valid, beacon1_valid; +--- a/drivers/net/wireless/rt2x00/rt2x00mac.c ++++ b/drivers/net/wireless/rt2x00/rt2x00mac.c +@@ -152,13 +152,22 @@ void rt2x00mac_tx(struct ieee80211_hw *h + if (unlikely(rt2x00queue_write_tx_frame(queue, skb, false))) + goto exit_fail; - if (!b43_is_mode(wl, NL80211_IFTYPE_AP) && -- !b43_is_mode(wl, NL80211_IFTYPE_MESH_POINT)) -+ !b43_is_mode(wl, NL80211_IFTYPE_MESH_POINT) && -+ !b43_is_mode(wl, NL80211_IFTYPE_ADHOC)) - return; ++ /* ++ * Pausing queue has to be serialized with rt2x00lib_txdone(). Note ++ * we should not use spin_lock_bh variant as bottom halve was already ++ * disabled before ieee80211_xmit() call. ++ */ ++ spin_lock(&queue->tx_lock); + if (rt2x00queue_threshold(queue)) + rt2x00queue_pause_queue(queue); ++ spin_unlock(&queue->tx_lock); + + return; + + exit_fail: ++ spin_lock(&queue->tx_lock); + rt2x00queue_pause_queue(queue); ++ spin_unlock(&queue->tx_lock); + exit_free_skb: + ieee80211_free_txskb(hw, skb); + } +--- a/drivers/net/wireless/rt2x00/rt2x00queue.c ++++ b/drivers/net/wireless/rt2x00/rt2x00queue.c +@@ -619,6 +619,9 @@ int rt2x00queue_write_tx_frame(struct da + else if (test_bit(REQUIRE_DMA, &queue->rt2x00dev->cap_flags)) + rt2x00queue_align_frame(skb); + ++ /* ++ * That function must be called with bh disabled. ++ */ + spin_lock(&queue->tx_lock); - /* This is the bottom half of the asynchronous beacon update. */ + if (unlikely(rt2x00queue_full(queue))) {