]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
iwlwifi: mvm: honor the max_amsdu_subframes limit
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Thu, 17 May 2018 07:44:20 +0000 (10:44 +0300)
committerLuca Coelho <luciano.coelho@intel.com>
Wed, 30 May 2018 06:55:34 +0000 (09:55 +0300)
A peer can limit the number of subframes it can handle in a
single A-MSDU.  Honor this limit.

Note that the smallest limit is 8, and we are very unlikely to reach
that limit. So this isn't really a big deal.

Fixes: a6d5e32f247c ("iwlwifi: mvm: send large SKBs to the transport")
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
drivers/net/wireless/intel/iwlwifi/mvm/tx.c

index 0b7f98d00298537448e3f254dd94bdc160ee1c76..cf2591f2ac236ad9d03f54bffab350391750c21c 100644 (file)
@@ -844,6 +844,10 @@ static int iwl_mvm_tx_tso(struct iwl_mvm *mvm, struct sk_buff *skb,
         */
        num_subframes = (max_amsdu_len + pad) / (subf_len + pad);
 
+       if (sta->max_amsdu_subframes &&
+           num_subframes > sta->max_amsdu_subframes)
+               num_subframes = sta->max_amsdu_subframes;
+
        tcp_payload_len = skb_tail_pointer(skb) - skb_transport_header(skb) -
                tcp_hdrlen(skb) + skb->data_len;