From 268043d55f4c3391481c2606ebee1ffe8963622d Mon Sep 17 00:00:00 2001 From: David Spinadel Date: Mon, 3 Mar 2014 14:53:17 +0200 Subject: [PATCH] bgscan: Do not initialize bgscan if disabled by user Do not initialize bgscan if the user explicitly set bgscan to an empty string. Without this patch wpa_supplicant tries to initialize bgscan to the first option if the string is empty. Signed-off-by: David Spinadel --- wpa_supplicant/wpa_supplicant.c | 2 +- wpa_supplicant/wpa_supplicant.conf | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c index ad1a03e18..0829d09a1 100644 --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c @@ -573,7 +573,7 @@ static void wpa_supplicant_start_bgscan(struct wpa_supplicant *wpa_s) name = wpa_s->current_ssid->bgscan; else name = wpa_s->conf->bgscan; - if (name == NULL) + if (name == NULL || name[0] == '\0') return; if (wpas_driver_bss_selection(wpa_s)) return; diff --git a/wpa_supplicant/wpa_supplicant.conf b/wpa_supplicant/wpa_supplicant.conf index 442b44cbb..03c6f5fe4 100644 --- a/wpa_supplicant/wpa_supplicant.conf +++ b/wpa_supplicant/wpa_supplicant.conf @@ -603,6 +603,8 @@ fast_reauth=1 # bgscan="learn::: # [:]" # bgscan="learn:30:-45:300:/etc/wpa_supplicant/network1.bgscan" +# Explicitly disable bgscan by setting +# bgscan="" # # This option can also be set outside of all network blocks for the bgscan # parameter to apply for all the networks that have no specific bgscan