Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f9e5645 authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by John W. Linville
Browse files

iwlegacy: get rid of ap_sta_id 



Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d98e2942

drivers/net/wireless/iwlegacy/3945-mac.c

+0 −1
Original line number Diff line number Diff line
@@ -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;

drivers/net/wireless/iwlegacy/4965-mac.c

+1 −2
Original line number Diff line number Diff line
@@ -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);

drivers/net/wireless/iwlegacy/common.c

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/net/wireless/iwlegacy/common.h

+1 −1
Original line number Diff line number Diff line
@@ -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;