From: Felix Fietkau Date: Sun, 14 Nov 2010 14:20:11 +0000 (+0100) Subject: ath9k: block new AMPDU sessions if SC_OP_TXAGGR is not set X-Git-Tag: v3.0~2504^2~169^2^2~245 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=71a3bf3e94b745467fc4c3451a294910f0369555;p=platform%2Fkernel%2Flinux-amlogic.git ath9k: block new AMPDU sessions if SC_OP_TXAGGR is not set This makes further tx path cleanups easier Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville --- diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c index 6e93a53..dede9a9 100644 --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c @@ -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)