---

yaml --- r: 224610 b: refs/heads/master c: 71a3bf3 h: refs/heads/master v: v3
git-mirror · Nov 17, 2010 · 38c503d · 38c503d
1 parent eeb6ed7
commit 38c503d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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)