Commit 440d42c3 authored by Tomas Winkler's avatar Tomas Winkler Committed by David S. Miller

iwl4965: Remove redundant code in iwl4965_tx_cmd

This function removes redundant code in iwl4965_tx_cmd
function, leftovers of previous design.
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d1591314
...@@ -3267,8 +3267,7 @@ int iwl4965_tx_cmd(struct iwl4965_priv *priv, struct iwl4965_cmd *out_cmd, ...@@ -3267,8 +3267,7 @@ int iwl4965_tx_cmd(struct iwl4965_priv *priv, struct iwl4965_cmd *out_cmd,
struct ieee80211_hdr *hdr, u8 hdr_len, struct ieee80211_hdr *hdr, u8 hdr_len,
struct ieee80211_tx_control *ctrl, void *sta_in) struct ieee80211_tx_control *ctrl, void *sta_in)
{ {
struct iwl4965_tx_cmd cmd; struct iwl4965_tx_cmd *tx = &out_cmd->cmd.tx;
struct iwl4965_tx_cmd *tx = (struct iwl4965_tx_cmd *)&out_cmd->cmd.payload[0];
dma_addr_t scratch_phys; dma_addr_t scratch_phys;
u8 unicast = 0; u8 unicast = 0;
u8 is_data = 1; u8 is_data = 1;
...@@ -3287,26 +3286,6 @@ int iwl4965_tx_cmd(struct iwl4965_priv *priv, struct iwl4965_cmd *out_cmd, ...@@ -3287,26 +3286,6 @@ int iwl4965_tx_cmd(struct iwl4965_priv *priv, struct iwl4965_cmd *out_cmd,
if ((fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_DATA) if ((fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_DATA)
is_data = 0; is_data = 0;
memcpy(&cmd, &(out_cmd->cmd.tx), sizeof(struct iwl4965_tx_cmd));
memset(tx, 0, sizeof(struct iwl4965_tx_cmd));
memcpy(tx->hdr, hdr, hdr_len);
tx->len = cmd.len;
tx->driver_txop = cmd.driver_txop;
tx->stop_time.life_time = cmd.stop_time.life_time;
tx->tx_flags = cmd.tx_flags;
tx->sta_id = cmd.sta_id;
tx->tid_tspec = cmd.tid_tspec;
tx->timeout.pm_frame_timeout = cmd.timeout.pm_frame_timeout;
tx->next_frame_len = cmd.next_frame_len;
tx->sec_ctl = cmd.sec_ctl;
memcpy(&(tx->key[0]), &(cmd.key[0]), 16);
tx->tx_flags = cmd.tx_flags;
tx->rts_retry_limit = cmd.rts_retry_limit;
tx->data_retry_limit = cmd.data_retry_limit;
scratch_phys = txcmd_phys + sizeof(struct iwl4965_cmd_header) + scratch_phys = txcmd_phys + sizeof(struct iwl4965_cmd_header) +
offsetof(struct iwl4965_tx_cmd, scratch); offsetof(struct iwl4965_tx_cmd, scratch);
tx->dram_lsb_ptr = cpu_to_le32(scratch_phys); tx->dram_lsb_ptr = cpu_to_le32(scratch_phys);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment