aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-tx.c
diff options
context:
space:
mode:
authorTomas Winkler <tomas.winkler@intel.com>2008-09-02 23:26:52 -0400
committerJohn W. Linville <linville@tuxdriver.com>2008-09-08 14:23:20 -0400
commit9734cb23a02f8de5fa99225ca61c7019ca9f232f (patch)
treed5556d4c8f905276e76ac2bc939a8f68e75211f0 /drivers/net/wireless/iwlwifi/iwl-tx.c
parentc90a74bae10dc2a4677d1bd06b6400db229d3e1e (diff)
iwlwifi: fix host command header according the HW spec
This patch aligns definition of host command with the spec. The inaccuracies weren't critical though. Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Zhu Yi <yi.zhu@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-tx.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-tx.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c b/drivers/net/wireless/iwlwifi/iwl-tx.c
index 6cba5e9c54ec..a004cc8ab8f5 100644
--- a/drivers/net/wireless/iwlwifi/iwl-tx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-tx.c
@@ -1057,7 +1057,7 @@ int iwl_enqueue_hcmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
1057 out_cmd->hdr.sequence = cpu_to_le16(QUEUE_TO_SEQ(IWL_CMD_QUEUE_NUM) | 1057 out_cmd->hdr.sequence = cpu_to_le16(QUEUE_TO_SEQ(IWL_CMD_QUEUE_NUM) |
1058 INDEX_TO_SEQ(q->write_ptr)); 1058 INDEX_TO_SEQ(q->write_ptr));
1059 if (out_cmd->meta.flags & CMD_SIZE_HUGE) 1059 if (out_cmd->meta.flags & CMD_SIZE_HUGE)
1060 out_cmd->hdr.sequence |= cpu_to_le16(SEQ_HUGE_FRAME); 1060 out_cmd->hdr.sequence |= SEQ_HUGE_FRAME;
1061 len = (idx == TFD_CMD_SLOTS) ? 1061 len = (idx == TFD_CMD_SLOTS) ?
1062 IWL_MAX_SCAN_SIZE : sizeof(struct iwl_cmd); 1062 IWL_MAX_SCAN_SIZE : sizeof(struct iwl_cmd);
1063 phys_addr = pci_map_single(priv->pci_dev, out_cmd, len, 1063 phys_addr = pci_map_single(priv->pci_dev, out_cmd, len,
@@ -1192,8 +1192,8 @@ void iwl_tx_cmd_complete(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb)
1192 u16 sequence = le16_to_cpu(pkt->hdr.sequence); 1192 u16 sequence = le16_to_cpu(pkt->hdr.sequence);
1193 int txq_id = SEQ_TO_QUEUE(sequence); 1193 int txq_id = SEQ_TO_QUEUE(sequence);
1194 int index = SEQ_TO_INDEX(sequence); 1194 int index = SEQ_TO_INDEX(sequence);
1195 int huge = sequence & SEQ_HUGE_FRAME;
1196 int cmd_index; 1195 int cmd_index;
1196 bool huge = !!(pkt->hdr.sequence & SEQ_HUGE_FRAME);
1197 struct iwl_cmd *cmd; 1197 struct iwl_cmd *cmd;
1198 1198
1199 /* If a Tx command is being handled and it isn't in the actual 1199 /* If a Tx command is being handled and it isn't in the actual