Add CONFIG_ROAMING option (off by default)

Change-Id: I846edd8a48e6c5e948732f28caf821055490d320
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk
index 8ad3a28..9d4b997 100644 (file)
--- a/wpa_supplicant/Android.mk
+++ b/wpa_supplicant/Android.mk
@@ -35,6 +35,10 @@ ifdef CONFIG_DRIVER_NL80211
 L_CFLAGS += -DANDROID_BRCM_P2P_PATCH
 endif
 
+ifdef CONFIG_ROAMING
+L_CFLAGS += -DCONFIG_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 812cd52..26e355e 100644 (file)
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
@@ -837,6 +837,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
        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);
@@ -871,6 +872,9 @@ static int wpa_supplicant_need_to_roam(struct wpa_supplicant *wpa_s,
        }
 
        return 1;
+#else
+       return 0;
+#endif
 }
 
 /* Return < 0 if no scan results could be fetched. */