aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>2013-10-22 04:27:55 -0400
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>2013-12-09 15:27:56 -0500
commit3961a61aad9b711bcd74aa7ea2c3655046df7b43 (patch)
treebe1d6c60711e09bf7e5402d00480d2f1655c9805
parente08fd975bf26aa8063cadd245817e042f570472d (diff)
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: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
-rw-r--r--drivers/net/wireless/iwlwifi/dvm/tx.c1
-rw-r--r--drivers/net/wireless/iwlwifi/mvm/tx.c1
-rw-r--r--drivers/net/wireless/iwlwifi/pcie/tx.c1
3 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/tx.c b/drivers/net/wireless/iwlwifi/dvm/tx.c
index 1fef5240e6ad..e12b1a63c484 100644
--- a/drivers/net/wireless/iwlwifi/dvm/tx.c
+++ b/drivers/net/wireless/iwlwifi/dvm/tx.c
@@ -368,6 +368,7 @@ int iwlagn_tx_skb(struct iwl_priv *priv,
368 goto drop_unlock_priv; 368 goto drop_unlock_priv;
369 369
370 memset(dev_cmd, 0, sizeof(*dev_cmd)); 370 memset(dev_cmd, 0, sizeof(*dev_cmd));
371 dev_cmd->hdr.cmd = REPLY_TX;
371 tx_cmd = (struct iwl_tx_cmd *) dev_cmd->payload; 372 tx_cmd = (struct iwl_tx_cmd *) dev_cmd->payload;
372 373
373 /* Total # bytes to be transmitted */ 374 /* Total # bytes to be transmitted */
diff --git a/drivers/net/wireless/iwlwifi/mvm/tx.c b/drivers/net/wireless/iwlwifi/mvm/tx.c
index 43d97c33a75a..1f1945806421 100644
--- a/drivers/net/wireless/iwlwifi/mvm/tx.c
+++ b/drivers/net/wireless/iwlwifi/mvm/tx.c
@@ -276,6 +276,7 @@ iwl_mvm_set_tx_params(struct iwl_mvm *mvm, struct sk_buff *skb,
276 return NULL; 276 return NULL;
277 277
278 memset(dev_cmd, 0, sizeof(*dev_cmd)); 278 memset(dev_cmd, 0, sizeof(*dev_cmd));
279 dev_cmd->hdr.cmd = TX_CMD;
279 tx_cmd = (struct iwl_tx_cmd *)dev_cmd->payload; 280 tx_cmd = (struct iwl_tx_cmd *)dev_cmd->payload;
280 281
281 if (info->control.hw_key) 282 if (info->control.hw_key)
diff --git a/drivers/net/wireless/iwlwifi/pcie/tx.c b/drivers/net/wireless/iwlwifi/pcie/tx.c
index 0adde919a258..ff977b083411 100644
--- a/drivers/net/wireless/iwlwifi/pcie/tx.c
+++ b/drivers/net/wireless/iwlwifi/pcie/tx.c
@@ -1674,7 +1674,6 @@ int iwl_trans_pcie_tx(struct iwl_trans *trans, struct sk_buff *skb,
1674 txq->entries[q->write_ptr].skb = skb; 1674 txq->entries[q->write_ptr].skb = skb;
1675 txq->entries[q->write_ptr].cmd = dev_cmd; 1675 txq->entries[q->write_ptr].cmd = dev_cmd;
1676 1676
1677 dev_cmd->hdr.cmd = REPLY_TX;
1678 dev_cmd->hdr.sequence = 1677 dev_cmd->hdr.sequence =
1679 cpu_to_le16((u16)(QUEUE_TO_SEQ(txq_id) | 1678 cpu_to_le16((u16)(QUEUE_TO_SEQ(txq_id) |
1680 INDEX_TO_SEQ(q->write_ptr))); 1679 INDEX_TO_SEQ(q->write_ptr)));