From 38c503dc5fad8dbc35cd9261c1d2e8e3aeb4b169 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 14 Nov 2010 15:20:11 +0100
Subject: [PATCH] --- yaml --- r: 224610 b: refs/heads/master c:
 71a3bf3e94b745467fc4c3451a294910f0369555 h: refs/heads/master v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/net/wireless/ath/ath9k/main.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ec762002196d..4b9c7f6b65f6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 28d167086227969fd6586953ee4ac682a3c394ff
+refs/heads/master: 71a3bf3e94b745467fc4c3451a294910f0369555
diff --git a/trunk/drivers/net/wireless/ath/ath9k/main.c b/trunk/drivers/net/wireless/ath/ath9k/main.c
index 6e93a53c5e32..dede9a9aa689 100644
--- a/trunk/drivers/net/wireless/ath/ath9k/main.c
+++ b/trunk/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)