diff options
| author | havlenapetr <havlenapetr@gmail.com> | 2010-08-20 09:48:02 +0200 |
|---|---|---|
| committer | Pawit Pornkitprasan <p.pawit@gmail.com> | 2012-04-25 16:25:28 +0700 |
| commit | 68fffe943efe8d17b36bbb71c4448026e84cada1 (patch) | |
| tree | a761a41b21a5a0d6cc24d27dbf39cc74ae970dd3 | |
| parent | c620bd1917b89dc7ef1d24dcd25749423807f658 (diff) | |
| download | android_external_wpa_supplicant_8-68fffe943efe8d17b36bbb71c4448026e84cada1.tar.gz android_external_wpa_supplicant_8-68fffe943efe8d17b36bbb71c4448026e84cada1.tar.bz2 android_external_wpa_supplicant_8-68fffe943efe8d17b36bbb71c4448026e84cada1.zip | |
disable android adhoc lock, only check if we aren't in mismatch
(cherry-picked from gingerbread)
Change-Id: Id1b37ce9df2eb46516574744fb03b2050fa3c63d
| -rw-r--r-- | wpa_supplicant/events.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c index b8329a70..dd55edf8 100644 --- a/wpa_supplicant/events.c +++ b/wpa_supplicant/events.c @@ -592,9 +592,10 @@ static struct wpa_ssid * wpa_scan_res_match(struct wpa_supplicant *wpa_s, continue; } - if (bss->caps & IEEE80211_CAP_IBSS) { + if ((bss->caps & IEEE80211_CAP_IBSS) && + ssid->mode != IEEE80211_MODE_IBSS) { wpa_dbg(wpa_s, MSG_DEBUG, " skip - IBSS (adhoc) " - "network"); + "mismatch"); continue; } |