diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2011-08-16 11:55:46 -0700 |
|---|---|---|
| committer | Jouni Malinen <j@w1.fi> | 2012-02-25 18:22:31 +0200 |
| commit | e9af53ad39a19264bf5307a1b5923afc2b2f9b06 (patch) | |
| tree | dc538bc7c31ef95126aad5dc5240af589fe17f1e | |
| parent | e60b295186f5a70ab066eb35c4cea0153f54976c (diff) | |
| download | external_wpa_supplicant_8_ti-e9af53ad39a19264bf5307a1b5923afc2b2f9b06.zip external_wpa_supplicant_8_ti-e9af53ad39a19264bf5307a1b5923afc2b2f9b06.tar.gz external_wpa_supplicant_8_ti-e9af53ad39a19264bf5307a1b5923afc2b2f9b06.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>
| -rw-r--r-- | wpa_supplicant/Android.mk | 5 | ||||
| -rw-r--r-- | wpa_supplicant/events.c | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk index 70d0538..5d5f95a 100644 --- a/wpa_supplicant/Android.mk +++ b/wpa_supplicant/Android.mk @@ -34,6 +34,11 @@ L_CFLAGS = -DWPA_IGNORE_CONFIG_ERRORS # 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 0cc1fc2..ec02702 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 */ } |