ath9k: block new AMPDU sessions if SC_OP_TXAGGR is not set
authorFelix Fietkau <nbd@openwrt.org>
Sun, 14 Nov 2010 14:20:11 +0000 (15:20 +0100)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 17 Nov 2010 21:19:25 +0000 (16:19 -0500)
This makes further tx path cleanups easier

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/ath/ath9k/main.c

index 6e93a53c5e3211984b36c3328319f9953f6e13d5..dede9a9aa68906408911c5310482f5b45ce6a7c8 100644 (file)
@@ -1979,6 +1979,9 @@ static int ath9k_ampdu_action(struct ieee80211_hw *hw,
        case IEEE80211_AMPDU_RX_STOP:
                break;
        case IEEE80211_AMPDU_TX_START:
+               if (!(sc->sc_flags & SC_OP_TXAGGR))
+                       return -EOPNOTSUPP;
+
                ath9k_ps_wakeup(sc);
                ret = ath_tx_aggr_start(sc, sta, tid, ssn);
                if (!ret)