diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2011-05-04 07:50:38 -0700 |
|---|---|---|
| committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-05-13 10:31:52 -0700 |
| commit | 3fa507386dc4cdf731344cb9361e9cca373cedb9 (patch) | |
| tree | 3368a5e3f9dcb39039aafeab25165091c62c5f5b /drivers/net/wireless/iwlwifi/iwl-tx.c | |
| parent | 6b86bd62a505a4a9739474f00f8088395b7a80ba (diff) | |
iwlagn: prepare for multi-TB commands
In a subsequent patch, I want to make commands use
multiple TBs in a TFD. This is a simple change to
prepare the data structures for this, with as of
now still just a single TB supported.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-tx.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-tx.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c b/drivers/net/wireless/iwlwifi/iwl-tx.c index e69597ea43e2..7843195efb05 100644 --- a/drivers/net/wireless/iwlwifi/iwl-tx.c +++ b/drivers/net/wireless/iwlwifi/iwl-tx.c @@ -446,7 +446,7 @@ int iwl_enqueue_hcmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd) u16 fix_size; bool is_ct_kill = false; - fix_size = (u16)(cmd->len + sizeof(out_cmd->hdr)); + fix_size = (u16)(cmd->len[0] + sizeof(out_cmd->hdr)); /* * If any of the command structures end up being larger than @@ -506,7 +506,7 @@ int iwl_enqueue_hcmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd) out_meta->callback = cmd->callback; out_cmd->hdr.cmd = cmd->id; - memcpy(&out_cmd->cmd.payload, cmd->data, cmd->len); + memcpy(&out_cmd->cmd.payload, cmd->data[0], cmd->len[0]); /* At this point, the out_cmd now has all of the incoming cmd * information */ @@ -555,7 +555,7 @@ int iwl_enqueue_hcmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd) priv->cfg->ops->lib->txq_attach_buf_to_tfd(priv, txq, phys_addr, fix_size, 1, - U32_PAD(cmd->len)); + U32_PAD(cmd->len[0])); /* Increment and update queue's write index */ q->write_ptr = iwl_queue_inc_wrap(q->write_ptr, q->n_bd); |