diff options
| author | John W. Linville | 2011-05-24 22:47:54 +0200 |
|---|---|---|
| committer | John W. Linville | 2011-05-24 22:47:54 +0200 |
| commit | 31ec97d9cebac804814de298592648f7c18d8281 (patch) | |
| tree | f725fcce0d5a9d6d7bd64b777de0a44e71773d0e /drivers/net/wireless/iwlwifi/iwl-agn-sta.c | |
| parent | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | wireless: fix fatal kernel-doc error + warning in mac80211.h (diff) | |
| download | kernel-qcow2-linux-31ec97d9cebac804814de298592648f7c18d8281.tar.gz kernel-qcow2-linux-31ec97d9cebac804814de298592648f7c18d8281.tar.xz kernel-qcow2-linux-31ec97d9cebac804814de298592648f7c18d8281.zip | |
Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn-sta.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-sta.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-sta.c b/drivers/net/wireless/iwlwifi/iwl-agn-sta.c index 079275f2c64d..0bd722cee5ae 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-sta.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-sta.c @@ -144,7 +144,7 @@ static int iwl_send_static_wepkey_cmd(struct iwl_priv *priv, size_t cmd_size = sizeof(struct iwl_wep_cmd); struct iwl_host_cmd cmd = { .id = ctx->wep_key_cmd, - .data = wep_cmd, + .data = { wep_cmd, }, .flags = CMD_SYNC, }; @@ -172,7 +172,7 @@ static int iwl_send_static_wepkey_cmd(struct iwl_priv *priv, cmd_size += sizeof(struct iwl_wep_key) * WEP_KEYS_MAX; - cmd.len = cmd_size; + cmd.len[0] = cmd_size; if (not_empty || send_if_empty) return iwl_send_cmd(priv, &cmd); |