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
-@@ -2160,7 +2160,7 @@ void ath9k_hw_setrxfilter(struct ath_hw
+@@ -2167,7 +2167,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;
if (conf_is_ht(&sc->hw->conf) &&
--- a/drivers/net/wireless/ath/ath9k/recv.c
+++ b/drivers/net/wireless/ath/ath9k/recv.c
-@@ -1619,6 +1619,7 @@ int ath_rx_tasklet(struct ath_softc *sc,
+@@ -1626,6 +1626,7 @@ int ath_rx_tasklet(struct ath_softc *sc,
struct ieee80211_rx_status *rxs;
struct ath_hw *ah = sc->sc_ah;
struct ath_common *common = ath9k_hw_common(ah);
/*
* The hw can technically differ from common->hw when using ath9k
* virtual wiphy so to account for that we iterate over the active
-@@ -1711,12 +1712,24 @@ int ath_rx_tasklet(struct ath_softc *sc,
+@@ -1718,12 +1719,24 @@ int ath_rx_tasklet(struct ath_softc *sc,
dma_type);
skb_put(skb, rs.rs_datalen + ah->caps.rx_status_len);
if (!txpending || (tid->state & AGGR_CLEANUP)) {
/*
* complete the acked-ones/xretried ones; update
-@@ -2019,7 +2021,7 @@ static void ath_tx_processq(struct ath_s
+@@ -2015,7 +2017,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;
-@@ -2058,11 +2060,15 @@ static void ath_tx_processq(struct ath_s
+@@ -2054,11 +2056,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);
-@@ -2136,9 +2142,11 @@ void ath_tx_edma_tasklet(struct ath_soft
+@@ -2132,9 +2138,11 @@ void ath_tx_edma_tasklet(struct ath_soft
int status;
int txok;
int qnum;
if (status == -EINPROGRESS)
break;
if (status == -EIO) {
-@@ -2181,16 +2189,20 @@ void ath_tx_edma_tasklet(struct ath_soft
+@@ -2177,16 +2185,20 @@ void ath_tx_edma_tasklet(struct ath_soft
qnum = skb_get_queue_mapping(bf->bf_mpdu);