From: Dmitry Shmidt Date: Tue, 16 Aug 2011 18:55:46 +0000 (-0700) Subject: Add CONFIG_NO_ROAMING option X-Git-Tag: aosp-jb-from-upstream~7 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a79068a5f3f8a75f97ff4f6e5d293252d9d59b8;p=thirdparty%2Fhostap.git Add CONFIG_NO_ROAMING option This can be used to disable wpa_supplicant controlled roaming. It should be noted that the WPA_DRIVER_FLAGS_BSS_SELECTION capability is the preferred way for this and CONFIG_NO_ROAMING should be obsoleted once drivers support the new NL80211_ATTR_ROAM_SUPPORT capability advertisement. Signed-off-by: Dmitry Shmidt (cherry picked from commit e9af53ad39a19264bf5307a1b5923afc2b2f9b06) --- diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk index 00f4602cc..e611d36f2 100644 --- a/wpa_supplicant/Android.mk +++ b/wpa_supplicant/Android.mk @@ -26,6 +26,11 @@ L_CFLAGS += -DVERSION_STR_POSTFIX=\"-$(PLATFORM_VERSION)\" # Set Android log name L_CFLAGS += -DANDROID_LOG_NAME=\"wpa_supplicant\" +# Disable roaming in wpa_supplicant +ifdef CONFIG_NO_ROAMING +L_CFLAGS += -DCONFIG_NO_ROAMING +endif + # Use Android specific directory for control interface sockets L_CFLAGS += -DCONFIG_CTRL_IFACE_CLIENT_DIR=\"/data/misc/wifi/sockets\" L_CFLAGS += -DCONFIG_CTRL_IFACE_DIR=\"/data/system/wpa_supplicant\" diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c index 7ee27c83b..a32dd4e72 100644 --- a/wpa_supplicant/events.c +++ b/wpa_supplicant/events.c @@ -951,6 +951,7 @@ static int wpa_supplicant_need_to_roam(struct wpa_supplicant *wpa_s, if (!current_bss) return 1; /* current BSS not seen in scan results */ +#ifndef CONFIG_NO_ROAMING wpa_dbg(wpa_s, MSG_DEBUG, "Considering within-ESS reassociation"); wpa_dbg(wpa_s, MSG_DEBUG, "Current BSS: " MACSTR " level=%d", MAC2STR(current_bss->bssid), current_bss->level); @@ -985,6 +986,9 @@ static int wpa_supplicant_need_to_roam(struct wpa_supplicant *wpa_s, } return 1; +#else /* CONFIG_NO_ROAMING */ + return 0; +#endif /* CONFIG_NO_ROAMING */ }