From 3376e8b401117ef8a3048d8c9c215c6051ac740b Mon Sep 17 00:00:00 2001 From: Emmanuel Grumbach Date: Tue, 19 Feb 2013 14:39:58 +0200 Subject: [PATCH] --- yaml --- r: 368449 b: refs/heads/master c: 5d158efa5577f3851d36f2bdf42ea7af66668b9c h: refs/heads/master i: 368447: 331d5957bc81213b8b52aba03ada4c6820dc7ed4 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/mvm/mac80211.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index b12e075802d5..8281dc52c6f0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 410dc5aa5906ed49e2733b451a5287884e8a16dc +refs/heads/master: 5d158efa5577f3851d36f2bdf42ea7af66668b9c diff --git a/trunk/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/trunk/drivers/net/wireless/iwlwifi/mvm/mac80211.c index 5939af8523c2..65fc5531f7ba 100644 --- a/trunk/drivers/net/wireless/iwlwifi/mvm/mac80211.c +++ b/trunk/drivers/net/wireless/iwlwifi/mvm/mac80211.c @@ -273,6 +273,10 @@ static int iwl_mvm_mac_ampdu_action(struct ieee80211_hw *hw, ret = iwl_mvm_sta_rx_agg(mvm, sta, tid, 0, false); break; case IEEE80211_AMPDU_TX_START: + if (iwlwifi_mod_params.disable_11n & IWL_DISABLE_HT_TXAGG) { + ret = -EINVAL; + break; + } ret = iwl_mvm_sta_tx_agg_start(mvm, vif, sta, tid, ssn); break; case IEEE80211_AMPDU_TX_STOP_CONT: