diff options
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/libertas/dev.h | 1 | ||||
-rw-r--r-- | drivers/net/wireless/libertas/main.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/libertas/scan.c | 5 |
3 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/wireless/libertas/dev.h b/drivers/net/wireless/libertas/dev.h index 83876a3c41ce..1dcfb05f5446 100644 --- a/drivers/net/wireless/libertas/dev.h +++ b/drivers/net/wireless/libertas/dev.h | |||
@@ -375,7 +375,6 @@ struct _wlan_adapter { | |||
375 | struct wlan_offset_value offsetvalue; | 375 | struct wlan_offset_value offsetvalue; |
376 | 376 | ||
377 | struct cmd_ds_802_11_get_log logmsg; | 377 | struct cmd_ds_802_11_get_log logmsg; |
378 | u16 scanprobes; | ||
379 | 378 | ||
380 | u32 pkttxctrl; | 379 | u32 pkttxctrl; |
381 | 380 | ||
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c index e354ebbca4b0..1d439cd3f436 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) | |||
998 | wlan_adapter *adapter = priv->adapter; | 998 | wlan_adapter *adapter = priv->adapter; |
999 | int i; | 999 | int i; |
1000 | 1000 | ||
1001 | adapter->scanprobes = 0; | ||
1002 | |||
1003 | adapter->bcn_avg_factor = DEFAULT_BCN_AVG_FACTOR; | 1001 | adapter->bcn_avg_factor = DEFAULT_BCN_AVG_FACTOR; |
1004 | adapter->data_avg_factor = DEFAULT_DATA_AVG_FACTOR; | 1002 | adapter->data_avg_factor = DEFAULT_DATA_AVG_FACTOR; |
1005 | 1003 | ||
diff --git a/drivers/net/wireless/libertas/scan.c b/drivers/net/wireless/libertas/scan.c index f471157c02df..7e4b0ab108dc 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, | |||
416 | scanmode); | 416 | scanmode); |
417 | 417 | ||
418 | /* Set the number of probes to send, use adapter setting if unset */ | 418 | /* Set the number of probes to send, use adapter setting if unset */ |
419 | numprobes = (puserscanin->numprobes ? puserscanin->numprobes : | 419 | numprobes = puserscanin->numprobes ? puserscanin->numprobes : 0; |
420 | adapter->scanprobes); | ||
421 | 420 | ||
422 | /* | 421 | /* |
423 | * Set the BSSID filter to the incoming configuration, | 422 | * Set the BSSID filter to the incoming configuration, |
@@ -450,7 +449,7 @@ wlan_scan_setup_scan_config(wlan_private * priv, | |||
450 | } | 449 | } |
451 | } else { | 450 | } else { |
452 | pscancfgout->bsstype = adapter->scanmode; | 451 | pscancfgout->bsstype = adapter->scanmode; |
453 | numprobes = adapter->scanprobes; | 452 | numprobes = 0; |
454 | } | 453 | } |
455 | 454 | ||
456 | /* If the input config or adapter has the number of Probes set, add tlv */ | 455 | /* If the input config or adapter has the number of Probes set, add tlv */ |