From: Holger Schurig <hs4233@mail.mn-solutions.de>
Date: Thu, 2 Aug 2007 17:12:12 +0000 (-0400)
Subject: [PATCH] libertas: remove adapter->scanmode
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d65ead886a193682f88b07aaf11d46127735a2b5;p=linux-beck.git

[PATCH] libertas: remove adapter->scanmode

scanmode was initialized with CMD_BSS_TYPE_ANY, but there is no code
that ever can store another value there, so it can go away.

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 602a93e88925..a33c523d0e98 100644
--- a/drivers/net/wireless/libertas/dev.h
+++ b/drivers/net/wireless/libertas/dev.h
@@ -263,7 +263,6 @@ struct _wlan_adapter {
 	struct bss_descriptor *networks;
 
 	u8 scantype;
-	u32 scanmode;
 
 	u8 adhoccreate;
 
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index 1c8760ca8644..7845cc346af0 100644
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -1004,9 +1004,6 @@ static void wlan_init_adapter(wlan_private * priv)
 	/* scan type */
 	adapter->scantype = CMD_SCAN_TYPE_ACTIVE;
 
-	/* scan mode */
-	adapter->scanmode = CMD_BSS_TYPE_ANY;
-
 	/* 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 7e4b0ab108dc..33ee459315a9 100644
--- a/drivers/net/wireless/libertas/scan.c
+++ b/drivers/net/wireless/libertas/scan.c
@@ -361,7 +361,6 @@ wlan_scan_setup_scan_config(wlan_private * priv,
 			    u8 * pfilteredscan,
 			    u8 * pscancurrentonly)
 {
-	wlan_adapter *adapter = priv->adapter;
 	struct mrvlietypes_numprobes *pnumprobestlv;
 	struct mrvlietypes_ssidparamset *pssidtlv;
 	struct wlan_scan_cmd_config * pscancfgout = NULL;
@@ -412,8 +411,7 @@ wlan_scan_setup_scan_config(wlan_private * priv,
 
 		/* Set the bss type scan filter, use adapter setting if unset */
 		pscancfgout->bsstype =
-		    (puserscanin->bsstype ? puserscanin->bsstype : adapter->
-		     scanmode);
+		    puserscanin->bsstype ? puserscanin->bsstype : CMD_BSS_TYPE_ANY;
 
 		/* Set the number of probes to send, use adapter setting if unset */
 		numprobes = puserscanin->numprobes ? puserscanin->numprobes : 0;
@@ -448,7 +446,7 @@ wlan_scan_setup_scan_config(wlan_private * priv,
 			*pfilteredscan = 1;
 		}
 	} else {
-		pscancfgout->bsstype = adapter->scanmode;
+		pscancfgout->bsstype = CMD_BSS_TYPE_ANY;
 		numprobes = 0;
 	}