iwlegacy: get rid of *_devtype

Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

4 files changed, 3 insertions, 11 deletions

diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c
index b11701f58741..15dcafbf29da 100644
--- a/drivers/net/wireless/iwlegacy/3945-mac.c
+++ b/drivers/net/wireless/iwlegacy/3945-mac.c
@@ -3621,9 +3621,6 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
         il->ctx.interface_modes =
             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
diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c b/drivers/net/wireless/iwlegacy/4965-mac.c
index af7886243fe0..33725e14e14e 100644
--- a/drivers/net/wireless/iwlegacy/4965-mac.c
+++ b/drivers/net/wireless/iwlegacy/4965-mac.c
@@ -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.exclusive_interface_modes = BIT(NL80211_IFTYPE_ADHOC);
         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);
 
diff --git a/drivers/net/wireless/iwlegacy/common.c b/drivers/net/wireless/iwlegacy/common.c
index b7567a8063be..19ed86771a2a 100644
--- a/drivers/net/wireless/iwlegacy/common.c
+++ b/drivers/net/wireless/iwlegacy/common.c
@@ -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));
 
         if (!ctx->vif) {
-                il->staging.dev_type = ctx->unused_devtype;
+                il->staging.dev_type = RXON_DEV_TYPE_ESS;
         } else
                 switch (ctx->vif->type) {
 
                 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;
                         break;
 
                 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.filter_flags =
                             RXON_FILTER_BCON_AWARE_MSK |
diff --git a/drivers/net/wireless/iwlegacy/common.h b/drivers/net/wireless/iwlegacy/common.h
index 66d0c1dd5894..8eac5712415d 100644
--- a/drivers/net/wireless/iwlegacy/common.h
+++ b/drivers/net/wireless/iwlegacy/common.h
@@ -1171,7 +1171,6 @@ struct il_rxon_context {
         int ctxid;
 
         u32 interface_modes, exclusive_interface_modes;
-        u8 unused_devtype, ap_devtype, ibss_devtype, station_devtype;
 
         struct il_qos_info qos_data;