[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>

diff --git a/drivers/net/wireless/libertas/dev.h b/drivers/net/wireless/libertas/dev.h
index 83876a3c41ce22bba08945b757b7eb3f8d453bd3..1dcfb05f544690cc57820f11c14944083a154705 100644 (file)
--- 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 e354ebbca4b0a4afb12b5271cd04bb0d337d021c..1d439cd3f436d368c59cf3528b747034d7437396 100644 (file)
--- 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 f471157c02df46230f028e230df5492d1577bbd0..7e4b0ab108dca7d85a8d1b77d9086f3939449fce 100644 (file)
--- 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 */