diff options
author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2015-10-26 10:00:29 -0400 |
---|---|---|
committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2016-02-27 15:00:01 -0500 |
commit | bb81bb68f472bb0f9afbb483259d91d4efd86bfb (patch) | |
tree | 9885a84948a24719c515ccdb27d64ad8a25157b1 /drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | |
parent | a6d5e32f247cbd3e34c7f86effbf4b426a018c32 (diff) |
iwlwifi: mvm: add Tx A-MSDU inside A-MPDU
If the peer allows, we can have A-MSDU inside A-MDPU.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c')
-rw-r--r-- | drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c index f1ed90bc2740..1a4946fc9b27 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | |||
@@ -847,6 +847,7 @@ static int iwl_mvm_mac_ampdu_action(struct ieee80211_hw *hw, | |||
847 | u16 tid = params->tid; | 847 | u16 tid = params->tid; |
848 | u16 *ssn = ¶ms->ssn; | 848 | u16 *ssn = ¶ms->ssn; |
849 | u8 buf_size = params->buf_size; | 849 | u8 buf_size = params->buf_size; |
850 | bool amsdu = params->amsdu; | ||
850 | 851 | ||
851 | IWL_DEBUG_HT(mvm, "A-MPDU action on addr %pM tid %d: action %d\n", | 852 | IWL_DEBUG_HT(mvm, "A-MPDU action on addr %pM tid %d: action %d\n", |
852 | sta->addr, tid, action); | 853 | sta->addr, tid, action); |
@@ -907,7 +908,8 @@ static int iwl_mvm_mac_ampdu_action(struct ieee80211_hw *hw, | |||
907 | ret = iwl_mvm_sta_tx_agg_flush(mvm, vif, sta, tid); | 908 | ret = iwl_mvm_sta_tx_agg_flush(mvm, vif, sta, tid); |
908 | break; | 909 | break; |
909 | case IEEE80211_AMPDU_TX_OPERATIONAL: | 910 | case IEEE80211_AMPDU_TX_OPERATIONAL: |
910 | ret = iwl_mvm_sta_tx_agg_oper(mvm, vif, sta, tid, buf_size); | 911 | ret = iwl_mvm_sta_tx_agg_oper(mvm, vif, sta, tid, |
912 | buf_size, amsdu); | ||
911 | break; | 913 | break; |
912 | default: | 914 | default: |
913 | WARN_ON_ONCE(1); | 915 | WARN_ON_ONCE(1); |