aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorHolger Schurig <hs4233@mail.mn-solutions.de>2007-08-02 13:05:53 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 16:49:59 -0700
commite2aa334bee4ae9fe27f26b0732c0443d2f11a8af (patch)
tree29190b7f924fb7efda2ac1c8cfb12d956de41aa7 /drivers
parent6e22a855b27ddc0725c134cc428ee668e56ac9f8 (diff)
[PATCH] libertas: remove adapter->scanprobes
The variable was initialized to 0 and nowhere else to anything different. Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/libertas/dev.h1
-rw-r--r--drivers/net/wireless/libertas/main.c2
-rw-r--r--drivers/net/wireless/libertas/scan.c5
3 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/wireless/libertas/dev.h b/drivers/net/wireless/libertas/dev.h
index 83876a3c41c..1dcfb05f544 100644
--- a/drivers/net/wireless/libertas/dev.h
+++ b/drivers/net/wireless/libertas/dev.h
@@ -375,7 +375,6 @@ struct _wlan_adapter {
struct wlan_offset_value offsetvalue;
struct cmd_ds_802_11_get_log logmsg;
- u16 scanprobes;
u32 pkttxctrl;
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index e354ebbca4b..1d439cd3f43 100644
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -998,8 +998,6 @@ static void wlan_init_adapter(wlan_private * priv)
wlan_adapter *adapter = priv->adapter;
int i;
- adapter->scanprobes = 0;
-
adapter->bcn_avg_factor = DEFAULT_BCN_AVG_FACTOR;
adapter->data_avg_factor = DEFAULT_DATA_AVG_FACTOR;
diff --git a/drivers/net/wireless/libertas/scan.c b/drivers/net/wireless/libertas/scan.c
index f471157c02d..7e4b0ab108d 100644
--- a/drivers/net/wireless/libertas/scan.c
+++ b/drivers/net/wireless/libertas/scan.c
@@ -416,8 +416,7 @@ wlan_scan_setup_scan_config(wlan_private * priv,
scanmode);
/* Set the number of probes to send, use adapter setting if unset */
- numprobes = (puserscanin->numprobes ? puserscanin->numprobes :
- adapter->scanprobes);
+ numprobes = puserscanin->numprobes ? puserscanin->numprobes : 0;
/*
* Set the BSSID filter to the incoming configuration,
@@ -450,7 +449,7 @@ wlan_scan_setup_scan_config(wlan_private * priv,
}
} else {
pscancfgout->bsstype = adapter->scanmode;
- numprobes = adapter->scanprobes;
+ numprobes = 0;
}
/* If the input config or adapter has the number of Probes set, add tlv */