iwlwifi: pcie: don't pad AMSDU packets

[linux.git] / drivers / net / wireless / intel / iwlwifi / pcie / tx-gen2.c

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c b/drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c
index b71cf55480fce7a5a4be7fbf2543036146b97733..09cdc15f764504d42dab1048adb768e57822f934 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c
@@ -454,7 +454,8 @@ iwl_tfh_tfd *iwl_pcie_gen2_build_tx(struct iwl_trans *trans,
                                    struct sk_buff *skb,
                                    struct iwl_cmd_meta *out_meta,
                                    int hdr_len,
-                                   int tx_cmd_len)
+                                   int tx_cmd_len,
+                                   bool pad)
 {
        int idx = iwl_pcie_get_cmd_index(txq, txq->write_ptr);
        struct iwl_tfh_tfd *tfd = iwl_pcie_get_tfd(trans, txq, idx);
@@ -478,7 +479,10 @@ iwl_tfh_tfd *iwl_pcie_gen2_build_tx(struct iwl_trans *trans,
        len = tx_cmd_len + sizeof(struct iwl_cmd_header) + hdr_len -
              IWL_FIRST_TB_SIZE;
 
-       tb1_len = ALIGN(len, 4);
+       if (pad)
+               tb1_len = ALIGN(len, 4);
+       else
+               tb1_len = len;
 
        /* map the data for TB1 */
        tb1_addr = ((u8 *)&dev_cmd->hdr) + IWL_FIRST_TB_SIZE;
@@ -551,7 +555,7 @@ struct iwl_tfh_tfd *iwl_pcie_gen2_build_tfd(struct iwl_trans *trans,
                                                    out_meta, hdr_len, len);
 
        return iwl_pcie_gen2_build_tx(trans, txq, dev_cmd, skb, out_meta,
-                                     hdr_len, len);
+                                     hdr_len, len, !amsdu);
 }
 
 int iwl_trans_pcie_gen2_tx(struct iwl_trans *trans, struct sk_buff *skb,