Commit ea74b19d authored by Sara Sharon's avatar Sara Sharon Committed by Luca Coelho
Browse files

iwlwifi: pcie: don't pad AMSDU packets 



When we TX AMSDU, we shouldn't pad the packet. In the past,
we were building AMSDU only in transport layer, and gen2
functions are built based on this. However, now that op mode
may build AMSDUs, we need to take care of padding also in
gen2 "non-pcie-amsdu" path.

Signed-off-by: default avatarSara Sharon <sara.sharon@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 8c7fd6a3

drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c

+7 −3
Original line number Diff line number Diff line
@@ -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;



	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,

CRA Git | Maintained and supported by SUSTech CRA and CCSE