diff options
| author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2013-02-19 14:39:58 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-03-06 16:46:59 +0100 |
| commit | 5d158efa5577f3851d36f2bdf42ea7af66668b9c (patch) | |
| tree | 644f81158ce3931c456cb654a18f50f987884319 | |
| parent | 410dc5aa5906ed49e2733b451a5287884e8a16dc (diff) | |
| download | linux-3.10-5d158efa5577f3851d36f2bdf42ea7af66668b9c.tar.gz linux-3.10-5d158efa5577f3851d36f2bdf42ea7af66668b9c.tar.bz2 linux-3.10-5d158efa5577f3851d36f2bdf42ea7af66668b9c.zip | |
iwlwifi: mvm: respect disable Tx AGG parameter
We didn't check that we allowed to start Tx AGG. This can
possibly be avoided by a module parameter. Fix that.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
| -rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/mac80211.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwlwifi/mvm/mac80211.c index 5939af8523c..65fc5531f7b 100644 --- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c +++ b/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: |