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

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

iwlegacy: get rid of wep_key_cmd 



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

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

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

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

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

drivers/net/wireless/iwlegacy/common.h

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