static inline void ath9k_hw_set11n_txdesc(struct ath_hw *ah, void *ds,
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -2139,7 +2139,7 @@ void ath9k_hw_setrxfilter(struct ath_hw
+@@ -2142,7 +2142,7 @@ void ath9k_hw_setrxfilter(struct ath_hw
phybits |= AR_PHY_ERR_RADAR;
if (bits & ATH9K_RX_FILTER_PHYERR)
phybits |= AR_PHY_ERR_OFDM_TIMING | AR_PHY_ERR_CCK_TIMING;
bf->bf_buf_addr = dma_map_single(sc->dev, requeue_skb->data,
--- a/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
-@@ -476,6 +476,8 @@ static void ath_tx_complete_aggr(struct
+@@ -478,6 +478,8 @@ static void ath_tx_complete_aggr(struct
list_move_tail(&bf->list, &bf_head);
}
if (!txpending || (tid->state & AGGR_CLEANUP)) {
/*
* complete the acked-ones/xretried ones; update
-@@ -2004,7 +2006,7 @@ static void ath_tx_processq(struct ath_s
+@@ -2006,7 +2008,7 @@ static void ath_tx_processq(struct ath_s
ds = lastbf->bf_desc;
memset(&ts, 0, sizeof(ts));
if (status == -EINPROGRESS) {
spin_unlock_bh(&txq->axq_lock);
break;
-@@ -2043,11 +2045,15 @@ static void ath_tx_processq(struct ath_s
+@@ -2045,11 +2047,15 @@ static void ath_tx_processq(struct ath_s
qnum = skb_get_queue_mapping(bf->bf_mpdu);
if (txq == sc->tx.txq_map[qnum])
ath_wake_mac80211_queue(sc, qnum);
-@@ -2121,9 +2127,11 @@ void ath_tx_edma_tasklet(struct ath_soft
+@@ -2123,9 +2129,11 @@ void ath_tx_edma_tasklet(struct ath_soft
int status;
int txok;
int qnum;
if (status == -EINPROGRESS)
break;
if (status == -EIO) {
-@@ -2166,16 +2174,20 @@ void ath_tx_edma_tasklet(struct ath_soft
+@@ -2168,16 +2176,20 @@ void ath_tx_edma_tasklet(struct ath_soft
qnum = skb_get_queue_mapping(bf->bf_mpdu);