Commit 3961a61a authored by Emmanuel Grumbach's avatar Emmanuel Grumbach
Browse files

iwlwifi: remove TX_CMD id from transport layer 



The transport layer doesn't need to know the TX_CMD id.
It can be set by the op_mode.
The transport layer still needs to know the layout of the
Tx command because of alignment issues and because of the
scratch pointer.

Reviewed-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent e08fd975

drivers/net/wireless/iwlwifi/dvm/tx.c

+1 −0
Original line number Diff line number Diff line
@@ -368,6 +368,7 @@ int iwlagn_tx_skb(struct iwl_priv *priv, 
		goto drop_unlock_priv;



	memset(dev_cmd, 0, sizeof(*dev_cmd));

	dev_cmd->hdr.cmd = REPLY_TX;

	tx_cmd = (struct iwl_tx_cmd *) dev_cmd->payload;



	/* Total # bytes to be transmitted */

drivers/net/wireless/iwlwifi/mvm/tx.c

+1 −0
Original line number Diff line number Diff line
@@ -276,6 +276,7 @@ iwl_mvm_set_tx_params(struct iwl_mvm *mvm, struct sk_buff *skb, 
		return NULL;



	memset(dev_cmd, 0, sizeof(*dev_cmd));

	dev_cmd->hdr.cmd = TX_CMD;

	tx_cmd = (struct iwl_tx_cmd *)dev_cmd->payload;



	if (info->control.hw_key)

drivers/net/wireless/iwlwifi/pcie/tx.c

+0 −1
Original line number Diff line number Diff line
@@ -1674,7 +1674,6 @@ int iwl_trans_pcie_tx(struct iwl_trans *trans, struct sk_buff *skb, 
	txq->entries[q->write_ptr].skb = skb;

	txq->entries[q->write_ptr].cmd = dev_cmd;



	dev_cmd->hdr.cmd = REPLY_TX;

	dev_cmd->hdr.sequence =

		cpu_to_le16((u16)(QUEUE_TO_SEQ(txq_id) |

			    INDEX_TO_SEQ(q->write_ptr)));

CRA Git | Maintained and supported by SUSTech CRA and CCSE