diff options
author | Stanislaw Gruszka <sgruszka@redhat.com> | 2012-02-03 11:31:42 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-02-06 14:55:59 -0500 |
commit | d98e294231a29699848fd0e923d91fe979e13802 (patch) | |
tree | d4e15b536e6df03a751a15771c10b636ebb903ce | |
parent | b96ed60cd0c352891fd04f4aa748f4d36a6cec5b (diff) |
iwlegacy: get rid of wep_key_cmd
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/iwlegacy/3945-mac.c | 1 | ||||
-rw-r--r-- | drivers/net/wireless/iwlegacy/4965-mac.c | 3 | ||||
-rw-r--r-- | drivers/net/wireless/iwlegacy/common.h | 2 |
3 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c index bbbac26d8f4b..4a01acbf3a27 100644 --- a/drivers/net/wireless/iwlegacy/3945-mac.c +++ b/drivers/net/wireless/iwlegacy/3945-mac.c | |||
@@ -3620,7 +3620,6 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
3620 | il->ctx.ctxid = 0; | 3620 | il->ctx.ctxid = 0; |
3621 | 3621 | ||
3622 | il->ctx.ap_sta_id = IL_AP_ID; | 3622 | il->ctx.ap_sta_id = IL_AP_ID; |
3623 | il->ctx.wep_key_cmd = C_WEPKEY; | ||
3624 | il->ctx.interface_modes = | 3623 | il->ctx.interface_modes = |
3625 | BIT(NL80211_IFTYPE_STATION) | BIT(NL80211_IFTYPE_ADHOC); | 3624 | BIT(NL80211_IFTYPE_STATION) | BIT(NL80211_IFTYPE_ADHOC); |
3626 | il->ctx.ibss_devtype = RXON_DEV_TYPE_IBSS; | 3625 | il->ctx.ibss_devtype = RXON_DEV_TYPE_IBSS; |
diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c b/drivers/net/wireless/iwlegacy/4965-mac.c index 2ee5de38bb31..a2955a45c332 100644 --- a/drivers/net/wireless/iwlegacy/4965-mac.c +++ b/drivers/net/wireless/iwlegacy/4965-mac.c | |||
@@ -2823,7 +2823,7 @@ il4965_static_wepkey_cmd(struct il_priv *il, struct il_rxon_context *ctx, | |||
2823 | struct il_wep_cmd *wep_cmd = (struct il_wep_cmd *)buff; | 2823 | struct il_wep_cmd *wep_cmd = (struct il_wep_cmd *)buff; |
2824 | size_t cmd_size = sizeof(struct il_wep_cmd); | 2824 | size_t cmd_size = sizeof(struct il_wep_cmd); |
2825 | struct il_host_cmd cmd = { | 2825 | struct il_host_cmd cmd = { |
2826 | .id = ctx->wep_key_cmd, | 2826 | .id = C_WEPKEY, |
2827 | .data = wep_cmd, | 2827 | .data = wep_cmd, |
2828 | .flags = CMD_SYNC, | 2828 | .flags = CMD_SYNC, |
2829 | }; | 2829 | }; |
@@ -6136,7 +6136,6 @@ il4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
6136 | il->ctx.always_active = true; | 6136 | il->ctx.always_active = true; |
6137 | il->ctx.is_active = true; | 6137 | il->ctx.is_active = true; |
6138 | il->ctx.ap_sta_id = IL_AP_ID; | 6138 | il->ctx.ap_sta_id = IL_AP_ID; |
6139 | il->ctx.wep_key_cmd = C_WEPKEY; | ||
6140 | il->ctx.ac_to_fifo = il4965_bss_ac_to_fifo; | 6139 | il->ctx.ac_to_fifo = il4965_bss_ac_to_fifo; |
6141 | il->ctx.ac_to_queue = il4965_bss_ac_to_queue; | 6140 | il->ctx.ac_to_queue = il4965_bss_ac_to_queue; |
6142 | il->ctx.exclusive_interface_modes = BIT(NL80211_IFTYPE_ADHOC); | 6141 | il->ctx.exclusive_interface_modes = BIT(NL80211_IFTYPE_ADHOC); |
diff --git a/drivers/net/wireless/iwlegacy/common.h b/drivers/net/wireless/iwlegacy/common.h index b08ddd134430..46835f932bfc 100644 --- a/drivers/net/wireless/iwlegacy/common.h +++ b/drivers/net/wireless/iwlegacy/common.h | |||
@@ -1175,8 +1175,6 @@ struct il_rxon_context { | |||
1175 | 1175 | ||
1176 | u8 bcast_sta_id, ap_sta_id; | 1176 | u8 bcast_sta_id, ap_sta_id; |
1177 | 1177 | ||
1178 | u8 wep_key_cmd; | ||
1179 | |||
1180 | struct il_wep_key wep_keys[WEP_KEYS_MAX]; | 1178 | struct il_wep_key wep_keys[WEP_KEYS_MAX]; |
1181 | u8 key_mapping_keys; | 1179 | u8 key_mapping_keys; |
1182 | 1180 | ||