aboutsummaryrefslogtreecommitdiffstats
path: root/src/ap
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2015-03-17 11:00:54 -0700
committerDmitry Shmidt <dimitrysh@google.com>2015-03-17 11:03:19 -0700
commitf73259cc00af557e36add405799b7f2326587c13 (patch)
tree3d2217c2850c5b07e542509f00426e8b69e44b88 /src/ap
parent4dd28dc25895165566a1c8a9cac7bcd755ff8fe3 (diff)
downloadandroid_external_wpa_supplicant_8-f73259cc00af557e36add405799b7f2326587c13.tar.gz
android_external_wpa_supplicant_8-f73259cc00af557e36add405799b7f2326587c13.tar.bz2
android_external_wpa_supplicant_8-f73259cc00af557e36add405799b7f2326587c13.zip
Cumulative patch from commit 0b08f25445caacb502c394e917a292d7fa595447
0b08f25 wpa_gui: Documentation update 6128a90 hostapd: Add channel 140 to allowed HT40 channel pairs 8ffaafa wpa_cli: Add missing parameters for "set" command completion routine 0fd9d95 wpa_cli: Add completion routine for "get" command 5c6c315 Add IPv4 support function for "get" control interface command 74fa78b Add AVG_BEACON_RSSI to SIGNAL_POLL output 4acdc48 nl80211: Handle NL80211_ATTR_EXT_FEATURES attribute a0563ac Sync with mac80211-next.git include/uapi/linux/nl80211.h 0f89328 P2P: Move upper layer SD interaction into a separate file 8b94980 FT: Avoid unnecessary allocation for MIC calculation 18da814 The master branch is now used for v2.5 development bc04db9 Change version information for the 2.4 release bc1d23a Add ChangeLog entries for v2.4 319d9da Fix bitfield_get_first_zero() to not read beyond buffer 39c3bfc Indicate AP-DISABLED on main AP mode deinit path f10487e Send CTRL-EVENT-DISCONNECTED on wpa_supplicant AP deinit Change-Id: I0b8459261265a25fe0edd7b435ede32be3cc6616 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'src/ap')
-rw-r--r--src/ap/hostapd.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c
index f6019ac2..3e4e16b4 100644
--- a/src/ap/hostapd.c
+++ b/src/ap/hostapd.c
@@ -1619,6 +1619,7 @@ static void hostapd_bss_deinit(struct hostapd_data *hapd)
wpa_printf(MSG_DEBUG, "%s: deinit bss %s", __func__,
hapd->conf->iface);
hostapd_bss_deinit_no_free(hapd);
+ wpa_msg(hapd->msg_ctx, MSG_INFO, AP_EVENT_DISABLED);
hostapd_cleanup(hapd);
}
@@ -1631,6 +1632,8 @@ void hostapd_interface_deinit(struct hostapd_iface *iface)
if (iface == NULL)
return;
+ hostapd_set_state(iface, HAPD_IFACE_DISABLED);
+
#ifdef CONFIG_IEEE80211N
#ifdef NEED_AP_MLME
hostapd_stop_setup_timers(iface);