summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuanyuan Liu <yuanliu@qca.qualcomm.com>2016-03-03 15:55:44 -0800
committerAnjaneedevi Kapparapu <akappa@codeaurora.org>2016-03-11 12:21:43 +0530
commit486387bd7aa60bfae5edec196ed8e59384d3aaef (patch)
treec4939294a2e6ff26ab39a57616a1d8725934868b
parent64cec5d7ac9afcab12e5eeae85db46925a3bb462 (diff)
qcacld-2.0: Send WLAN off event to WLS at the end of WLAN off steps
send WLAN off event to WLS at the end of WLAN off steps to make sure WLAN is really off when WLS calls 'glink deinit'. Change-Id: I29e15d51ec306071fc9f5ff7e3565c75814944e8 CRs-Fixed: 985226
-rw-r--r--CORE/HDD/src/wlan_hdd_early_suspend.c9
-rw-r--r--CORE/HDD/src/wlan_hdd_main.c8
2 files changed, 9 insertions, 8 deletions
diff --git a/CORE/HDD/src/wlan_hdd_early_suspend.c b/CORE/HDD/src/wlan_hdd_early_suspend.c
index 95f35d3416c8..d7eaf0e67200 100644
--- a/CORE/HDD/src/wlan_hdd_early_suspend.c
+++ b/CORE/HDD/src/wlan_hdd_early_suspend.c
@@ -1917,10 +1917,6 @@ VOS_STATUS hdd_wlan_shutdown(void)
hddLog(VOS_TRACE_LEVEL_FATAL, "%s: WLAN driver shutting down! ",__func__);
-#ifdef WLAN_FEATURE_LPSS
- wlan_hdd_send_status_pkg(NULL, NULL, 0, 0);
-#endif
-
/* If SSR never completes, then do kernel panic. */
hdd_ssr_timer_init();
hdd_ssr_timer_start(HDD_SSR_BRING_UP_TIME);
@@ -2086,6 +2082,11 @@ VOS_STATUS hdd_wlan_shutdown(void)
hddLog(VOS_TRACE_LEVEL_ERROR, "%s: failed to free power on lock",
__func__);
}
+
+#ifdef WLAN_FEATURE_LPSS
+ wlan_hdd_send_status_pkg(NULL, NULL, 0, 0);
+#endif
+
hddLog(VOS_TRACE_LEVEL_FATAL, "%s: WLAN driver shutdown complete"
,__func__);
return VOS_STATUS_SUCCESS;
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index 746b701c1fc2..a2c0d1d5d268 100644
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -12809,6 +12809,10 @@ void hdd_wlan_exit(hdd_context_t *pHddCtx)
if (VOS_FTM_MODE != hdd_get_conparam())
wlan_hdd_logging_sock_deactivate_svc(pHddCtx);
+#ifdef WLAN_FEATURE_LPSS
+ wlan_hdd_send_status_pkg(NULL, NULL, 0, 0);
+#endif
+
#ifdef WLAN_KD_READY_NOTIFIER
cnss_diag_notify_wlan_close();
nl_srv_exit(pHddCtx->ptt_pid);
@@ -12908,10 +12912,6 @@ void __hdd_wlan_exit(void)
vos_set_load_unload_in_progress(VOS_MODULE_ID_VOSS, TRUE);
vos_set_unload_in_progress(TRUE);
-#ifdef WLAN_FEATURE_LPSS
- wlan_hdd_send_status_pkg(NULL, NULL, 0, 0);
-#endif
-
//Do all the cleanup before deregistering the driver
memdump_deinit();
hdd_driver_memdump_deinit();