iwlegacy: get rid of ap_sta_id

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 4a01acbf3a277bcaba6a170b6a8da134a91f47ce..8072ae8b0ce8689ea26cf7a25d4a7d294140f2b2 100644 (file)
--- a/drivers/net/wireless/iwlegacy/3945-mac.c
+++ b/drivers/net/wireless/iwlegacy/3945-mac.c
@@ -3619,7 +3619,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.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 a2955a45c332c2313a5589e60286b13052ee6663..f2b03cd243b5cbd00329d39a03178d87d0590a8a 100644 (file)
--- a/drivers/net/wireless/iwlegacy/4965-mac.c
+++ b/drivers/net/wireless/iwlegacy/4965-mac.c
@@ -2906,7 +2906,7 @@ il4965_set_default_wep_key(struct il_priv *il, struct il_rxon_context *ctx,
 
        keyconf->flags &= ~IEEE80211_KEY_FLAG_GENERATE_IV;
        keyconf->hw_key_idx = HW_KEY_DEFAULT;
-       il->stations[ctx->ap_sta_id].keyinfo.cipher = keyconf->cipher;
+       il->stations[IL_AP_ID].keyinfo.cipher = keyconf->cipher;
 
        ctx->wep_keys[keyconf->keyidx].key_size = keyconf->keylen;
        memcpy(&ctx->wep_keys[keyconf->keyidx].key, &keyconf->key,
@@ -6135,7 +6135,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.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.c b/drivers/net/wireless/iwlegacy/common.c
index b95f832b14eaa2444ea47be4ea768948f677c204..d30a2062992bfa102a9e1887496c23bb40916257 100644 (file)
--- a/drivers/net/wireless/iwlegacy/common.c
+++ b/drivers/net/wireless/iwlegacy/common.c
@@ -1899,7 +1899,7 @@ il_prep_station(struct il_priv *il, struct il_rxon_context *ctx,
        u16 rate;
 
        if (is_ap)
-               sta_id = ctx->ap_sta_id;
+               sta_id = IL_AP_ID;
        else if (is_broadcast_ether_addr(addr))
                sta_id = ctx->bcast_sta_id;
        else

diff --git a/drivers/net/wireless/iwlegacy/common.h b/drivers/net/wireless/iwlegacy/common.h
index 46835f932bfc8238ccb4ca4697c53b0ab1d9ab9c..cf7352f45cdb0bccba25c32d5a6214e133a51b25 100644 (file)
--- a/drivers/net/wireless/iwlegacy/common.h
+++ b/drivers/net/wireless/iwlegacy/common.h
@@ -1173,7 +1173,7 @@ struct il_rxon_context {
 
        struct il_qos_info qos_data;
 
-       u8 bcast_sta_id, ap_sta_id;
+       u8 bcast_sta_id;
 
        struct il_wep_key wep_keys[WEP_KEYS_MAX];
        u8 key_mapping_keys;