aboutsummaryrefslogtreecommitdiffstats
path: root/src/ap/acs.h
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2013-10-24 11:08:13 -0700
committerDmitry Shmidt <dimitrysh@google.com>2013-10-24 11:08:13 -0700
commit4ce9c87407c036fc83eb5a6044ddf976c86f53fc (patch)
tree79a484914a928a845e8410ec65a2129516a60f62 /src/ap/acs.h
parent051af73b8f8014eff33330aead0f36944b3403e6 (diff)
downloadandroid_external_wpa_supplicant_8-4ce9c87407c036fc83eb5a6044ddf976c86f53fc.tar.gz
android_external_wpa_supplicant_8-4ce9c87407c036fc83eb5a6044ddf976c86f53fc.tar.bz2
android_external_wpa_supplicant_8-4ce9c87407c036fc83eb5a6044ddf976c86f53fc.zip
Cumulative patch from commit fa56315cfc9ebaff2b210ed99d43dda9b16bdf56
fa56315 eap_proxy: Add context data pointer to the get_imsi call 07041c6 eap_proxy: Confirm eap_proxy initialization before reading SIM info 47d986e P2P: Check Action frame payload match before accepted TX status d259249 Fix ENABLE_NETWORK not to reconnect in disconnected state 677cf19 hostapd: Select any supported channel if ACS fails 20f9cb1 hostapd: Allow ACS to deal with partial survey data 3645fd5 hostapd: Propagate ACS errors to iface setup 0e1d0b3 hostapd: Don't get stuck after failed ACS af8a827 Make frequency range list routines more general 941dae0 P2P: Add more user friendly debug print of channel lists Change-Id: I942dbbc0cb92f4e09626ec6ea17f6ea583c17f1a Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'src/ap/acs.h')
-rw-r--r--src/ap/acs.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ap/acs.h b/src/ap/acs.h
index 0d1d0f1a..a41f17f3 100644
--- a/src/ap/acs.h
+++ b/src/ap/acs.h
@@ -13,7 +13,7 @@
#ifdef CONFIG_ACS
enum hostapd_chan_status acs_init(struct hostapd_iface *iface);
-int hostapd_acs_completed(struct hostapd_iface *iface);
+int hostapd_acs_completed(struct hostapd_iface *iface, int err);
#else /* CONFIG_ACS */