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

iwlegacy: get rid of *_devtype

Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent b16db50a
...@@ -3621,9 +3621,6 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -3621,9 +3621,6 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
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.station_devtype = RXON_DEV_TYPE_ESS;
il->ctx.unused_devtype = RXON_DEV_TYPE_ESS;
/* /*
* Disabling hardware scan means that mac80211 will perform scans * Disabling hardware scan means that mac80211 will perform scans
......
...@@ -6140,10 +6140,6 @@ il4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -6140,10 +6140,6 @@ il4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
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);
il->ctx.interface_modes = BIT(NL80211_IFTYPE_STATION); il->ctx.interface_modes = BIT(NL80211_IFTYPE_STATION);
il->ctx.ap_devtype = RXON_DEV_TYPE_AP;
il->ctx.ibss_devtype = RXON_DEV_TYPE_IBSS;
il->ctx.station_devtype = RXON_DEV_TYPE_ESS;
il->ctx.unused_devtype = RXON_DEV_TYPE_ESS;
SET_IEEE80211_DEV(hw, &pdev->dev); SET_IEEE80211_DEV(hw, &pdev->dev);
......
...@@ -4002,17 +4002,17 @@ il_connection_init_rx_config(struct il_priv *il, struct il_rxon_context *ctx) ...@@ -4002,17 +4002,17 @@ il_connection_init_rx_config(struct il_priv *il, struct il_rxon_context *ctx)
memset(&il->staging, 0, sizeof(il->staging)); memset(&il->staging, 0, sizeof(il->staging));
if (!ctx->vif) { if (!ctx->vif) {
il->staging.dev_type = ctx->unused_devtype; il->staging.dev_type = RXON_DEV_TYPE_ESS;
} else } else
switch (ctx->vif->type) { switch (ctx->vif->type) {
case NL80211_IFTYPE_STATION: case NL80211_IFTYPE_STATION:
il->staging.dev_type = ctx->station_devtype; il->staging.dev_type = RXON_DEV_TYPE_ESS;
il->staging.filter_flags = RXON_FILTER_ACCEPT_GRP_MSK; il->staging.filter_flags = RXON_FILTER_ACCEPT_GRP_MSK;
break; break;
case NL80211_IFTYPE_ADHOC: case NL80211_IFTYPE_ADHOC:
il->staging.dev_type = ctx->ibss_devtype; il->staging.dev_type = RXON_DEV_TYPE_IBSS;
il->staging.flags = RXON_FLG_SHORT_PREAMBLE_MSK; il->staging.flags = RXON_FLG_SHORT_PREAMBLE_MSK;
il->staging.filter_flags = il->staging.filter_flags =
RXON_FILTER_BCON_AWARE_MSK | RXON_FILTER_BCON_AWARE_MSK |
......
...@@ -1171,7 +1171,6 @@ struct il_rxon_context { ...@@ -1171,7 +1171,6 @@ struct il_rxon_context {
int ctxid; int ctxid;
u32 interface_modes, exclusive_interface_modes; u32 interface_modes, exclusive_interface_modes;
u8 unused_devtype, ap_devtype, ibss_devtype, station_devtype;
struct il_qos_info qos_data; struct il_qos_info qos_data;
......
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