---

yaml --- r: 183615 b: refs/heads/master c: f052797 h: refs/heads/master i: 183613: 495be56 183611: 327e410 183607: 21c6832 183599: d8d0325 183583: 33c973b 183551: 6ab0706 v: v3
git-mirror · Jan 12, 2010 · a445755 · a445755
1 parent bb4d1ca
commit a445755
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: 90be561b119a9e5439733f09cc70bd4ce9ec8022
+refs/heads/master: f05279711b9a59ac10e0b6e5f3a7447886c72704
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c b/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -2955,6 +2955,9 @@ static int iwl_mac_ampdu_action(struct ieee80211_hw *hw,
 			return 0;
 		else
 			return ret;
+	case IEEE80211_AMPDU_TX_OPERATIONAL:
+		/* do nothing */
+		return -EOPNOTSUPP;
 	default:
 		IWL_DEBUG_HT(priv, "unknown\n");
 		return -EINVAL;