From f9b2dc18fa233ffb70b41e6682393047e86bead3 Mon Sep 17 00:00:00 2001 From: Manikandan Mohan Date: Fri, 17 Feb 2017 16:49:57 -0800 Subject: [PATCH] qcacld-3.0: Update cfg80211 stop_ap to handle SSR Clear SOFTAP INIT DONE flag at the beginning of stop_ap cfg80211 function to handle SSR case. Thus SAP will not be restarted after SSR. SAP adapter will be cleaned up during SSR even though stop_ap returns failure as it could not be processed during SSR. Change-Id: Ia90b26c68f7ded4481aa4cbdd8f424453853da21 CRs-fixed: 2008697 --- core/hdd/src/wlan_hdd_hostapd.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index d46412e60d24..1a703cf183fb 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -7899,7 +7899,12 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy, pAdapter->device_mode == QDF_P2P_GO_MODE)) { return -EOPNOTSUPP; } - + /* Clear SOFTAP_INIT_DONE flag to mark stop_ap deinit. So that we do + * not restart SAP after SSR as SAP is already stopped from user space. + * This update is moved to start of this function to resolve stop_ap + * call during SSR case. Adapter gets cleaned up as part of SSR. + */ + clear_bit(SOFTAP_INIT_DONE, &pAdapter->event_flags); hdd_notice("Device_mode %s(%d)", hdd_device_mode_to_string(pAdapter->device_mode), pAdapter->device_mode); @@ -8028,7 +8033,6 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy, } /* Reset WNI_CFG_PROBE_RSP Flags */ wlan_hdd_reset_prob_rspies(pAdapter); - clear_bit(SOFTAP_INIT_DONE, &pAdapter->event_flags); #ifdef WLAN_FEATURE_P2P_DEBUG if ((pAdapter->device_mode == QDF_P2P_GO_MODE) &&