summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
diff options
context:
space:
mode:
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>2015-10-28 10:47:41 +0300
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>2016-02-27 23:00:02 +0300
commit04e3a5da6b73d7f01661288ead426986fa5312a1 (patch)
treedf6d0d6e656e147db43f112544d033a283899f5c /drivers/net/wireless/intel/iwlwifi/mvm/tx.c
parent9e7dce28659531b2741939e5b6f438bca1422720 (diff)
downloadlinux-04e3a5da6b73d7f01661288ead426986fa5312a1.tar.xz
iwlwifi: mvm: don't enable A-MSDU when the rates are too low
Allow A-MSDU only when we are not downscaling and the initial MCS is at least 5. Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/mvm/tx.c')
-rw-r--r--drivers/net/wireless/intel/iwlwifi/mvm/tx.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
index a5a55da142eb..a73ae01f3a48 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
@@ -460,7 +460,8 @@ static int iwl_mvm_tx_tso(struct iwl_mvm *mvm, struct sk_buff *skb,
return -EINVAL;
if (!sta->max_amsdu_len ||
- !ieee80211_is_data_qos(hdr->frame_control)) {
+ !ieee80211_is_data_qos(hdr->frame_control) ||
+ !mvmsta->tlc_amsdu) {
num_subframes = 1;
pad = 0;
goto segment;