diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2013-11-05 10:07:29 -0800 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2013-11-05 10:07:29 -0800 |
| commit | b96dad47218788efffa3db0fe7f1b54a7d19e366 (patch) | |
| tree | aadd283f80c68c591a199b319d4c11d3fd0f7788 /src/ap | |
| parent | 4e45558d160f5ae131def0e63ff7f6b2e41d9fe2 (diff) | |
| download | android_external_wpa_supplicant_8-b96dad47218788efffa3db0fe7f1b54a7d19e366.tar.gz android_external_wpa_supplicant_8-b96dad47218788efffa3db0fe7f1b54a7d19e366.tar.bz2 android_external_wpa_supplicant_8-b96dad47218788efffa3db0fe7f1b54a7d19e366.zip | |
Cumulative patch from commit 2b6623ab134fff6d96114f5fe329a2f87d5e893a
2b6623a hostapd: Do not terminate process on dynamic interface add failure
217cf49 P2P: Add more debug prints for frequency selection
4dd3f86 P2P: Fix bug in GO frequency selection
9804873 wpa_supplicant: Fix bug in get_shared_radio_freqs
3342c26 wpa_supplicant: Fix updating GO beacons on WFD subelements change
72c12c1 EAPOL: Fix static analyzer warnings for pac_opaque_encr_key
3139270 bgscan: Add global bgscan configuration
efc58df eap_proxy: Re-read IMSI from proxy in Interworking functionality
Change-Id: I006abd3b52fbbd1a7b97059364c72ab0386d5f63
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'src/ap')
| -rw-r--r-- | src/ap/hostapd.c | 5 | ||||
| -rw-r--r-- | src/ap/hostapd.h | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c index 5d51c777..52be3110 100644 --- a/src/ap/hostapd.c +++ b/src/ap/hostapd.c @@ -1082,7 +1082,8 @@ int hostapd_setup_interface_complete(struct hostapd_iface *iface, int err) if (err) { wpa_printf(MSG_ERROR, "Interface initialization failed"); hostapd_set_state(iface, HAPD_IFACE_DISABLED); - eloop_terminate(); + if (iface->interfaces && iface->interfaces->terminate_on_error) + eloop_terminate(); return -1; } @@ -1187,6 +1188,8 @@ int hostapd_setup_interface_complete(struct hostapd_iface *iface, int err) wpa_printf(MSG_DEBUG, "%s: Setup of interface done.", iface->bss[0]->conf->iface); + if (iface->interfaces && iface->interfaces->terminate_on_error > 0) + iface->interfaces->terminate_on_error--; return 0; } diff --git a/src/ap/hostapd.h b/src/ap/hostapd.h index 05bcb620..adb3728d 100644 --- a/src/ap/hostapd.h +++ b/src/ap/hostapd.h @@ -45,6 +45,8 @@ struct hapd_interfaces { gid_t ctrl_iface_group; struct hostapd_iface **iface; struct hostapd_dynamic_iface **dynamic_iface; + + size_t terminate_on_error; }; enum hostapd_chan_status { |