diff options
| author | Stanislaw Gruszka <sgruszka@redhat.com> | 2012-02-03 17:31:43 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-02-06 20:55:59 +0100 |
| commit | 8f9e56455310a3d75e8239db9729acb2b31dbdad (patch) | |
| tree | 26eef96072718fe8793f1034f22c75211ef6ca2a | |
| parent | iwlegacy: get rid of wep_key_cmd (diff) | |
| download | linux-8f9e56455310a3d75e8239db9729acb2b31dbdad.tar.xz linux-8f9e56455310a3d75e8239db9729acb2b31dbdad.zip | |
iwlegacy: get rid of ap_sta_id
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.c | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/iwlegacy/common.h | 2 |
4 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c index 4a01acbf3a27..8072ae8b0ce8 100644 --- 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 a2955a45c332..f2b03cd243b5 100644 --- 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 b95f832b14ea..d30a2062992b 100644 --- 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 46835f932bfc..cf7352f45cdb 100644 --- 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; |