aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/libertas/scan.c
diff options
context:
space:
mode:
authorHolger Schurig <hs4233@mail.mn-solutions.de>2007-08-02 13:12:12 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 19:50:07 -0400
commitd65ead886a193682f88b07aaf11d46127735a2b5 (patch)
tree466cd9aea9478a405e632cfe51fd28e66fec9409 /drivers/net/wireless/libertas/scan.c
parent2c85103da3c88a06a7c01eece709482d85eff07f (diff)
[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>
Diffstat (limited to 'drivers/net/wireless/libertas/scan.c')
-rw-r--r--drivers/net/wireless/libertas/scan.c6
1 files changed, 2 insertions, 4 deletions
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,
361 u8 * pfilteredscan, 361 u8 * pfilteredscan,
362 u8 * pscancurrentonly) 362 u8 * pscancurrentonly)
363{ 363{
364 wlan_adapter *adapter = priv->adapter;
365 struct mrvlietypes_numprobes *pnumprobestlv; 364 struct mrvlietypes_numprobes *pnumprobestlv;
366 struct mrvlietypes_ssidparamset *pssidtlv; 365 struct mrvlietypes_ssidparamset *pssidtlv;
367 struct wlan_scan_cmd_config * pscancfgout = NULL; 366 struct wlan_scan_cmd_config * pscancfgout = NULL;
@@ -412,8 +411,7 @@ wlan_scan_setup_scan_config(wlan_private * priv,
412 411
413 /* Set the bss type scan filter, use adapter setting if unset */ 412 /* Set the bss type scan filter, use adapter setting if unset */
414 pscancfgout->bsstype = 413 pscancfgout->bsstype =
415 (puserscanin->bsstype ? puserscanin->bsstype : adapter-> 414 puserscanin->bsstype ? puserscanin->bsstype : CMD_BSS_TYPE_ANY;
416 scanmode);
417 415
418 /* Set the number of probes to send, use adapter setting if unset */ 416 /* Set the number of probes to send, use adapter setting if unset */
419 numprobes = puserscanin->numprobes ? puserscanin->numprobes : 0; 417 numprobes = puserscanin->numprobes ? puserscanin->numprobes : 0;
@@ -448,7 +446,7 @@ wlan_scan_setup_scan_config(wlan_private * priv,
448 *pfilteredscan = 1; 446 *pfilteredscan = 1;
449 } 447 }
450 } else { 448 } else {
451 pscancfgout->bsstype = adapter->scanmode; 449 pscancfgout->bsstype = CMD_BSS_TYPE_ANY;
452 numprobes = 0; 450 numprobes = 0;
453 } 451 }
454 452