From: Reinette Chatre <reinette.chatre@intel.com>
To: linville@tuxdriver.com
Cc: linux-wireless@vger.kernel.org,
Tomas Winkler <tomas.winkler@intel.com>,
Zhu Yi <yi.zhu@intel.com>
Subject: [PATCH 01/12] iwl4965: Remove redundant code in iwl4965_tx_cmd
Date: Mon, 14 Jan 2008 17:46:14 -0800 [thread overview]
Message-ID: <1200361585-31801-2-git-send-email-reinette.chatre@intel.com> (raw)
In-Reply-To: <1200361585-31801-1-git-send-email-reinette.chatre@intel.com>
From: Tomas Winkler <tomas.winkler@intel.com>
This function removes redundant code in iwl4965_tx_cmd
function, leftovers of previous design.
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
---
drivers/net/wireless/iwlwifi/iwl-4965.c | 23 +----------------------
1 files changed, 1 insertions(+), 22 deletions(-)
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c
index ed3f119..b913c6b 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
@@ -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_tx_control *ctrl, void *sta_in)
{
- struct iwl4965_tx_cmd cmd;
- struct iwl4965_tx_cmd *tx = (struct iwl4965_tx_cmd *)&out_cmd->cmd.payload[0];
+ struct iwl4965_tx_cmd *tx = &out_cmd->cmd.tx;
dma_addr_t scratch_phys;
u8 unicast = 0;
u8 is_data = 1;
@@ -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)
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) +
offsetof(struct iwl4965_tx_cmd, scratch);
tx->dram_lsb_ptr = cpu_to_le32(scratch_phys);
--
1.5.3.4
next prev parent reply other threads:[~2008-01-15 2:26 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-01-15 1:46 [PATCH 00/12] iwlwifi driver updates Reinette Chatre
2008-01-15 1:46 ` Reinette Chatre [this message]
2008-01-15 1:46 ` [PATCH 02/12] iwlwifi: move iwl4965_get_dma_hi_address function to iwl-helpers.h Reinette Chatre
2008-01-15 1:46 ` [PATCH 03/12] iwlwifi: remove iwl4965_tx_cmd Reinette Chatre
2008-01-15 1:46 ` [PATCH 04/12] iwlwifi: document scan command Reinette Chatre
2008-01-15 1:46 ` [PATCH 05/12] iwlwifi: delay firmware loading from pci_probe to network interface open Reinette Chatre
2008-01-15 1:46 ` [PATCH 06/12] iwlwifi: fix problem when rf_killswitch change during suspend/resume Reinette Chatre
2008-01-15 1:46 ` [PATCH 07/12] iwlwifi: move uCode helper functions to iwl-helpers.h Reinette Chatre
2008-01-15 1:46 ` [PATCH 08/12] iwlwifi: 4965 unify rate scale variable names for station data Reinette Chatre
2008-01-15 1:46 ` [PATCH 09/12] iwlwifi: 3954 renames iwl3945_rate_scale_priv to iwl3945_rs_sta Reinette Chatre
2008-01-15 1:46 ` [PATCH 10/12] iwlwifi: Update iwlwifi version stamp to 1.2.23 Reinette Chatre
2008-01-15 1:46 ` [PATCH 11/12] iwlwifi: remove reference to non-existent documentation Reinette Chatre
2008-01-15 1:46 ` [PATCH 12/12] iwlwifi: style fixes to usage of << and >> operators Reinette Chatre
2008-01-18 12:35 ` [PATCH 05/12] iwlwifi: delay firmware loading from pci_probe to network interface open Johannes Berg
2008-01-18 16:15 ` [PATCH 05/12] iwlwifi: delay firmware loading from pci_probeto " Chatre, Reinette
2008-01-16 0:02 ` [PATCH 04/12] iwlwifi: document scan command Johannes Berg
2008-01-18 16:34 ` Cahill, Ben M
2008-01-18 20:39 ` Johannes Berg
2008-01-21 15:51 ` Cahill, Ben M
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1200361585-31801-2-git-send-email-reinette.chatre@intel.com \
--to=reinette.chatre@intel.com \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=tomas.winkler@intel.com \
--cc=yi.zhu@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox