aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/libertas
diff options
context:
space:
mode:
authorHolger Schurig <hs4233@mail.mn-solutions.de>2007-08-02 13:12:27 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 19:50:08 -0400
commit4f2fdaaf0e4209bff3b18dc14c915b61f5fa5cd2 (patch)
treee076d4c7be629fbc1415a1f7976c89651fea0f5b /drivers/net/wireless/libertas
parentd65ead886a193682f88b07aaf11d46127735a2b5 (diff)
[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>
Diffstat (limited to 'drivers/net/wireless/libertas')
-rw-r--r--drivers/net/wireless/libertas/dev.h2
-rw-r--r--drivers/net/wireless/libertas/main.c3
-rw-r--r--drivers/net/wireless/libertas/scan.c2
3 files changed, 1 insertions, 6 deletions
diff --git a/drivers/net/wireless/libertas/dev.h b/drivers/net/wireless/libertas/dev.h
index a33c523d0e98..f6b1402509f5 100644
--- a/drivers/net/wireless/libertas/dev.h
+++ b/drivers/net/wireless/libertas/dev.h
@@ -262,8 +262,6 @@ struct _wlan_adapter {
262 struct list_head network_free_list; 262 struct list_head network_free_list;
263 struct bss_descriptor *networks; 263 struct bss_descriptor *networks;
264 264
265 u8 scantype;
266
267 u8 adhoccreate; 265 u8 adhoccreate;
268 266
269 /** capability Info used in Association, start, join */ 267 /** capability Info used in Association, start, join */
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index 7845cc346af0..9ccc9524153b 100644
--- 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)
1001 adapter->connect_status = LIBERTAS_DISCONNECTED; 1001 adapter->connect_status = LIBERTAS_DISCONNECTED;
1002 memset(adapter->current_addr, 0xff, ETH_ALEN); 1002 memset(adapter->current_addr, 0xff, ETH_ALEN);
1003 1003
1004 /* scan type */
1005 adapter->scantype = CMD_SCAN_TYPE_ACTIVE;
1006
1007 /* 802.11 specific */ 1004 /* 802.11 specific */
1008 adapter->secinfo.wep_enabled = 0; 1005 adapter->secinfo.wep_enabled = 0;
1009 for (i = 0; i < sizeof(adapter->wep_keys) / sizeof(adapter->wep_keys[0]); 1006 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 33ee459315a9..4f621a6ec976 100644
--- 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,
252 * be changed to passive on a per channel basis if restricted by 252 * be changed to passive on a per channel basis if restricted by
253 * regulatory requirements (11d or 11h) 253 * regulatory requirements (11d or 11h)
254 */ 254 */
255 scantype = adapter->scantype; 255 scantype = CMD_SCAN_TYPE_ACTIVE;
256 256
257 for (rgnidx = 0; rgnidx < ARRAY_SIZE(adapter->region_channel); rgnidx++) { 257 for (rgnidx = 0; rgnidx < ARRAY_SIZE(adapter->region_channel); rgnidx++) {
258 if (priv->adapter->enable11d && 258 if (priv->adapter->enable11d &&