iwlegacy: get rid of *_devtype

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

diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c
index b11701f58741a87091e2b09e8bcdee3d38b4c965..15dcafbf29dab66f580c507284e146d4e53fad82 100644 (file)
--- 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 af7886243fe058d9c717d27ecb8517e791ba07c6..33725e14e14e2ca9b42873910491917342f96b12 100644 (file)
--- 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 b7567a8063bed200357353b35527bc8b17c2eaba..19ed86771a2ad53c8ffec2b5eb6b4c0b52883bce 100644 (file)
--- 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 66d0c1dd5894589442fc4bf644c034330d55ad0b..8eac5712415d53adbc07947140a3c23ca64f3b63 100644 (file)
--- 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;