From 0a44ec81fd0fce985acfb6bd00df53d915827e9f Mon Sep 17 00:00:00 2001 From: Manikandan Mohan Date: Fri, 17 Feb 2017 15:06:11 -0800 Subject: [PATCH] qcacld-3.0: Fix warning during SAP SSR deinit Check for SAP BSS started flag before deinitialization of SAP context data, station disconnection and action frame cleanup Change-Id: I0191567818d5ee62a826531311cd08cb1a18ad28 CRs-fixed: 2008653 --- core/hdd/src/wlan_hdd_hostapd.c | 2 -- core/hdd/src/wlan_hdd_main.c | 13 +++++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index 1a703cf183fb..befc5860cc4f 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -8486,8 +8486,6 @@ void hdd_sap_indicate_disconnect_for_sta(hdd_adapter_t *adapter) } } - clear_bit(SOFTAP_BSS_STARTED, &adapter->event_flags); - EXIT(); } diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index 6f838366e6f6..02534a3740b4 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -4056,13 +4056,18 @@ QDF_STATUS hdd_reset_all_adapters(hdd_context_t *hdd_ctx) wlan_hdd_netif_queue_control(adapter, WLAN_NETIF_TX_DISABLE, WLAN_CONTROL_PATH); - hdd_sap_indicate_disconnect_for_sta(adapter); - hdd_cleanup_actionframe(hdd_ctx, adapter); - hdd_sap_destroy_events(adapter); - } else + if (test_bit(SOFTAP_BSS_STARTED, + &adapter->event_flags)) { + hdd_sap_indicate_disconnect_for_sta(adapter); + hdd_cleanup_actionframe(hdd_ctx, adapter); + hdd_sap_destroy_events(adapter); + } + clear_bit(SOFTAP_BSS_STARTED, &adapter->event_flags); + } else { wlan_hdd_netif_queue_control(adapter, WLAN_NETIF_TX_DISABLE_N_CARRIER, WLAN_CONTROL_PATH); + } adapter->sessionCtx.station.hdd_ReassocScenario = false;