From a4457552d8e6ca38ba992f1349aedb78e145fcb0 Mon Sep 17 00:00:00 2001
From: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Date: Fri, 8 Jan 2010 10:04:41 -0800
Subject: [PATCH] --- yaml --- r: 183615 b: refs/heads/master c:
 f05279711b9a59ac10e0b6e5f3a7447886c72704 h: refs/heads/master i:   183613:
 495be56a6ab146c8ee4e219c29b91576bd4add1d   183611:
 327e4107ee9beaeed3f84c8b5fc21c8f8650433c   183607:
 21c6832fa86d3649d08283a4078c74b9691dc07f   183599:
 d8d03259bec4ab212bacc77b96f195a54b334d74   183583:
 33c973bd28393d9ce1a6537a85a6e143840e5d18   183551:
 6ab0706e1cf43703ac2ac97ddc1b092658e6250b v: v3

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

diff --git a/[refs] b/[refs]
index a8ed585aaa9d..20a9648a2919 100644
--- 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
index 771b03c1c7c5..c78063312ea9 100644
--- 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;