diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2011-12-12 16:17:44 +0400 |
|---|---|---|
| committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-12-16 19:24:09 +0400 |
| commit | 69b172f79644fe60f8c536fcbe1db83a22d6c5fc (patch) | |
| tree | 2a4564d3c6d803581c324c189c9219b872eed8e3 /drivers | |
| parent | ee8ba8800b4f20845aa542ce53f3bc29064674b5 (diff) | |
| download | linux-69b172f79644fe60f8c536fcbe1db83a22d6c5fc.tar.xz | |
iwlagn: remove iwlagn_build_addsta_hcmd
This function is not needed:
* we already have the "cmd" input to it in the
same type (and on the stack elsewhere)
* the "legacy_reserved" parameter is never set,
so will always be zero
Remove the function and the stack copy of the
input command.
This is still left from when iwlegacy was part
of the driver -- then we needed a translation
for the command for 3945.
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')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-sta.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-sta.c b/drivers/net/wireless/iwlwifi/iwl-agn-sta.c index 6bf33119e025..7353826095f1 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-sta.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-sta.c @@ -130,25 +130,15 @@ int iwl_add_sta_callback(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb, return iwl_process_add_sta_resp(priv, addsta, pkt); } -static u16 iwlagn_build_addsta_hcmd(const struct iwl_addsta_cmd *cmd, u8 *data) -{ - u16 size = (u16)sizeof(struct iwl_addsta_cmd); - struct iwl_addsta_cmd *addsta = (struct iwl_addsta_cmd *)data; - memcpy(addsta, cmd, size); - /* resrved in agn */ - addsta->legacy_reserved = cpu_to_le16(0); - return size; -} - int iwl_send_add_sta(struct iwl_priv *priv, struct iwl_addsta_cmd *sta, u8 flags) { int ret = 0; - u8 data[sizeof(*sta)]; struct iwl_host_cmd cmd = { .id = REPLY_ADD_STA, .flags = flags, - .data = { data, }, + .data = { sta, }, + .len = { sizeof(*sta), }, }; u8 sta_id __maybe_unused = sta->sta.sta_id; @@ -160,7 +150,6 @@ int iwl_send_add_sta(struct iwl_priv *priv, might_sleep(); } - cmd.len[0] = iwlagn_build_addsta_hcmd(sta, data); ret = iwl_trans_send_cmd(trans(priv), &cmd); if (ret || (flags & CMD_ASYNC)) |