[PATCH] libertas: remove adapter->scantype

scantype was initialized with CMD_SCAN_TYPE_ACTIVE, but there is no code
that would ever change it, so we can use that variable directly.

Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/libertas/dev.h b/drivers/net/wireless/libertas/dev.h
index a33c523d0e98d5843a418a0ffb78fc13705e3b64..f6b1402509f5883feaf2bb6d9dd4044d74713583 100644 (file)
--- a/drivers/net/wireless/libertas/dev.h
+++ b/drivers/net/wireless/libertas/dev.h
@@ -262,8 +262,6 @@ struct _wlan_adapter {
        struct list_head network_free_list;
        struct bss_descriptor *networks;
 
-       u8 scantype;
-
        u8 adhoccreate;
 
        /** capability Info used in Association, start, join */

diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index 7845cc346af015001f82a25fe05b01df660ab3e6..9ccc9524153bf149a4945fd856f5380d77a4b923 100644 (file)
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -1001,9 +1001,6 @@ static void wlan_init_adapter(wlan_private * priv)
        adapter->connect_status = LIBERTAS_DISCONNECTED;
        memset(adapter->current_addr, 0xff, ETH_ALEN);
 
-       /* scan type */
-       adapter->scantype = CMD_SCAN_TYPE_ACTIVE;
-
        /* 802.11 specific */
        adapter->secinfo.wep_enabled = 0;
        for (i = 0; i < sizeof(adapter->wep_keys) / sizeof(adapter->wep_keys[0]);

diff --git a/drivers/net/wireless/libertas/scan.c b/drivers/net/wireless/libertas/scan.c
index 33ee459315a9d64f346f429bf16073a33e44094e..4f621a6ec976e9a2eadb8e5f26b6c1f657ca2d6e 100644 (file)
--- a/drivers/net/wireless/libertas/scan.c
+++ b/drivers/net/wireless/libertas/scan.c
@@ -252,7 +252,7 @@ static void wlan_scan_create_channel_list(wlan_private * priv,
         *   be changed to passive on a per channel basis if restricted by
         *   regulatory requirements (11d or 11h)
         */
-       scantype = adapter->scantype;
+       scantype = CMD_SCAN_TYPE_ACTIVE;
 
        for (rgnidx = 0; rgnidx < ARRAY_SIZE(adapter->region_channel); rgnidx++) {
                if (priv->adapter->enable11d &&