aboutsummaryrefslogtreecommitdiffstats
path: root/wpa_supplicant
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2012-02-21 16:30:45 -0800
committerDmitry Shmidt <dimitrysh@google.com>2012-02-21 16:30:45 -0800
commit006dedfbfff3ecae6996e5eb85240e42b0e6a7a4 (patch)
treefed1230af6298636927c457e5fedca489713ec07 /wpa_supplicant
parentea01dacb439e7c408e647f9a7c42f93abe3baaf0 (diff)
downloadexternal_wpa_supplicant_8-006dedfbfff3ecae6996e5eb85240e42b0e6a7a4.zip
external_wpa_supplicant_8-006dedfbfff3ecae6996e5eb85240e42b0e6a7a4.tar.gz
external_wpa_supplicant_8-006dedfbfff3ecae6996e5eb85240e42b0e6a7a4.tar.bz2
wpa_supplicant: Change option CONFIG_ROAMING to CONFIG_NO_ROAMING
Change-Id: I188968c04cd1fc2c4e6d424bec8aab8003be235e Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'wpa_supplicant')
-rw-r--r--wpa_supplicant/.config3
-rw-r--r--wpa_supplicant/Android.mk5
-rw-r--r--wpa_supplicant/events.c2
3 files changed, 9 insertions, 1 deletions
diff --git a/wpa_supplicant/.config b/wpa_supplicant/.config
index 29f4dbe..5aa4fcc 100644
--- a/wpa_supplicant/.config
+++ b/wpa_supplicant/.config
@@ -397,6 +397,9 @@ CONFIG_ANDROID_LOG=y
# MIC error reports by a random amount of time between 0 and 60 seconds
#CONFIG_DELAYED_MIC_ERROR_REPORT=y
+# Disable roaming in wpa_supplicant
+CONFIG_NO_ROAMING=y
+
# Enable P2P
# IEEE 802.11n (High Throughput) support (mainly for AP mode)
CONFIG_IEEE80211N=y
diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk
index 14d2ccd..4a28717 100644
--- a/wpa_supplicant/Android.mk
+++ b/wpa_supplicant/Android.mk
@@ -36,6 +36,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
+
ifeq ($(BOARD_WLAN_DEVICE), bcmdhd)
L_CFLAGS += -DANDROID_P2P
endif
diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c
index 9fb18a3..aaeeb06 100644
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
@@ -955,7 +955,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 */
-#ifdef CONFIG_ROAMING
+#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);