aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Kondik <shade@chemlab.org>2012-05-28 15:08:58 +0400
committerGerrit Code Review <gerrit@review.cyanogenmod.com>2012-05-28 15:08:58 +0400
commitf200ea0d98df0d61b045d10156c94383aaed6fce (patch)
tree848c1bea004e3a8fe551f86973a4a36f923ce057
parentcba72c0842a0caf6d23de55889a0348d60ab4bc8 (diff)
parent35074788b43db7760e654be9b80275271d668c69 (diff)
downloadandroid_external_wpa_supplicant_8-f200ea0d98df0d61b045d10156c94383aaed6fce.tar.gz
android_external_wpa_supplicant_8-f200ea0d98df0d61b045d10156c94383aaed6fce.tar.bz2
android_external_wpa_supplicant_8-f200ea0d98df0d61b045d10156c94383aaed6fce.zip
Merge "wpa_supplicant_8: Do not try to create ad-hoc network" into ics
-rw-r--r--wpa_supplicant/events.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c
index dd55edf8..da9c9612 100644
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
@@ -779,6 +779,12 @@ wpa_supplicant_pick_new_network(struct wpa_supplicant *wpa_s)
int prio;
struct wpa_ssid *ssid;
+// Don't try to automatically start a new ad-hoc network if no network
+// is available on Android. It doesn't make sense as it'll fail anyway
+// because nothing will reply to the DHCP request. (It'll also
+// repeatedly fail because the frequency is not set and it'll keep
+// retrying draining battery.)
+#ifndef ANDROID
for (prio = 0; prio < wpa_s->conf->num_prio; prio++) {
for (ssid = wpa_s->conf->pssid[prio]; ssid; ssid = ssid->pnext)
{
@@ -789,6 +795,7 @@ wpa_supplicant_pick_new_network(struct wpa_supplicant *wpa_s)
return ssid;
}
}
+#endif
return NULL;
}