aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2011-08-16 18:55:46 (GMT)
committerJouni Malinen <j@w1.fi>2012-08-09 20:05:46 (GMT)
commit9a79068a5f3f8a75f97ff4f6e5d293252d9d59b8 (patch)
tree069864075aa0be1d09563a42bf207738632779f8
parent142ee90095a36fd2c32f6d81da197968cd286eec (diff)
downloadhostap-9a79068a5f3f8a75f97ff4f6e5d293252d9d59b8.zip
hostap-9a79068a5f3f8a75f97ff4f6e5d293252d9d59b8.tar.gz
hostap-9a79068a5f3f8a75f97ff4f6e5d293252d9d59b8.tar.bz2
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 <dimitrysh@google.com> (cherry picked from commit e9af53ad39a19264bf5307a1b5923afc2b2f9b06)
-rw-r--r--wpa_supplicant/Android.mk5
-rw-r--r--wpa_supplicant/events.c4
2 files changed, 9 insertions, 0 deletions
diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk
index 00f4602..e611d36 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 7ee27c8..a32dd4e 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 */
}