iwlegacy: get rid of wep_key_cmd

Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c
index bbbac26d8f4b465e9b96b2b7d08380909b2ca069..4a01acbf3a277bcaba6a170b6a8da134a91f47ce 100644 (file)
--- 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)
        il->ctx.ctxid = 0;
 
        il->ctx.ap_sta_id = IL_AP_ID;
-       il->ctx.wep_key_cmd = C_WEPKEY;
        il->ctx.interface_modes =
            BIT(NL80211_IFTYPE_STATION) | BIT(NL80211_IFTYPE_ADHOC);
        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 2ee5de38bb317d9746dd39622ae557859976073d..a2955a45c332c2313a5589e60286b13052ee6663 100644 (file)
--- 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,
        struct il_wep_cmd *wep_cmd = (struct il_wep_cmd *)buff;
        size_t cmd_size = sizeof(struct il_wep_cmd);
        struct il_host_cmd cmd = {
-               .id = ctx->wep_key_cmd,
+               .id = C_WEPKEY,
                .data = wep_cmd,
                .flags = CMD_SYNC,
        };
@@ -6136,7 +6136,6 @@ il4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        il->ctx.always_active = true;
        il->ctx.is_active = true;
        il->ctx.ap_sta_id = IL_AP_ID;
-       il->ctx.wep_key_cmd = C_WEPKEY;
        il->ctx.ac_to_fifo = il4965_bss_ac_to_fifo;
        il->ctx.ac_to_queue = il4965_bss_ac_to_queue;
        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 b08ddd13443027d32500050eaba1b747bdaaa63d..46835f932bfc8238ccb4ca4697c53b0ab1d9ab9c 100644 (file)
--- a/drivers/net/wireless/iwlegacy/common.h
+++ b/drivers/net/wireless/iwlegacy/common.h
@@ -1175,8 +1175,6 @@ struct il_rxon_context {
 
        u8 bcast_sta_id, ap_sta_id;
 
-       u8 wep_key_cmd;
-
        struct il_wep_key wep_keys[WEP_KEYS_MAX];
        u8 key_mapping_keys;