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

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
...@@ -3620,7 +3620,6 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -3620,7 +3620,6 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
il->ctx.ctxid = 0; il->ctx.ctxid = 0;
il->ctx.ap_sta_id = IL_AP_ID; il->ctx.ap_sta_id = IL_AP_ID;
il->ctx.wep_key_cmd = C_WEPKEY;
il->ctx.interface_modes = il->ctx.interface_modes =
BIT(NL80211_IFTYPE_STATION) | BIT(NL80211_IFTYPE_ADHOC); BIT(NL80211_IFTYPE_STATION) | BIT(NL80211_IFTYPE_ADHOC);
il->ctx.ibss_devtype = RXON_DEV_TYPE_IBSS; il->ctx.ibss_devtype = RXON_DEV_TYPE_IBSS;
......
...@@ -2823,7 +2823,7 @@ il4965_static_wepkey_cmd(struct il_priv *il, struct il_rxon_context *ctx, ...@@ -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; struct il_wep_cmd *wep_cmd = (struct il_wep_cmd *)buff;
size_t cmd_size = sizeof(struct il_wep_cmd); size_t cmd_size = sizeof(struct il_wep_cmd);
struct il_host_cmd cmd = { struct il_host_cmd cmd = {
.id = ctx->wep_key_cmd, .id = C_WEPKEY,
.data = wep_cmd, .data = wep_cmd,
.flags = CMD_SYNC, .flags = CMD_SYNC,
}; };
...@@ -6136,7 +6136,6 @@ il4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -6136,7 +6136,6 @@ il4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
il->ctx.always_active = true; il->ctx.always_active = true;
il->ctx.is_active = true; il->ctx.is_active = true;
il->ctx.ap_sta_id = IL_AP_ID; 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_fifo = il4965_bss_ac_to_fifo;
il->ctx.ac_to_queue = il4965_bss_ac_to_queue; il->ctx.ac_to_queue = il4965_bss_ac_to_queue;
il->ctx.exclusive_interface_modes = BIT(NL80211_IFTYPE_ADHOC); il->ctx.exclusive_interface_modes = BIT(NL80211_IFTYPE_ADHOC);
......
...@@ -1175,8 +1175,6 @@ struct il_rxon_context { ...@@ -1175,8 +1175,6 @@ struct il_rxon_context {
u8 bcast_sta_id, ap_sta_id; u8 bcast_sta_id, ap_sta_id;
u8 wep_key_cmd;
struct il_wep_key wep_keys[WEP_KEYS_MAX]; struct il_wep_key wep_keys[WEP_KEYS_MAX];
u8 key_mapping_keys; u8 key_mapping_keys;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment