[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 602a93e..a33c523 100644
--- a/drivers/net/wireless/libertas/dev.h
+++ b/drivers/net/wireless/libertas/dev.h
@@ -263,7 +263,6 @@
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 1c8760c..7845cc3 100644
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -1004,9 +1004,6 @@
/* 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 7e4b0ab..33ee4593 100644
--- a/drivers/net/wireless/libertas/scan.c
+++ b/drivers/net/wireless/libertas/scan.c
@@ -361,7 +361,6 @@
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 @@
/* 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 @@
*pfilteredscan = 1;
}
} else {
- pscancfgout->bsstype = adapter->scanmode;
+ pscancfgout->bsstype = CMD_BSS_TYPE_ANY;
numprobes = 0;
}