Merge "wpa_supplicant: Change option CONFIG_ROAMING to CONFIG_NO_ROAMING"
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 @@
# 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 5a54fc2..148a6d7 100644
--- a/wpa_supplicant/Android.mk
+++ b/wpa_supplicant/Android.mk
@@ -36,6 +36,11 @@
# 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 @@
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);