diff options
| author | Yuanyuan Liu <yuanliu@codeaurora.org> | 2016-08-17 15:41:35 -0700 |
|---|---|---|
| committer | qcabuildsw <qcabuildsw@localhost> | 2016-08-19 11:03:51 -0700 |
| commit | 3e918e5ca35de557f9167c30bf1a9202b38f35bf (patch) | |
| tree | 01e8c95a96410cbdc01780287298c396aab68534 | |
| parent | f2ee05f167917a1cc3c289cf88fdf496f5bbe455 (diff) | |
qcacld-3.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_main.c | 6 | ||||
| -rw-r--r-- | core/hdd/src/wlan_hdd_power.c | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index 60ded03db9dc..30e2c6b35d86 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -4570,6 +4570,8 @@ void hdd_wlan_exit(hdd_context_t *hdd_ctx) wiphy_unregister(wiphy); wlan_hdd_cfg80211_deinit(wiphy); + wlan_hdd_send_status_pkg(NULL, NULL, 0, 0); + hdd_exit_netlink_services(hdd_ctx); mutex_destroy(&hdd_ctx->iface_change_lock); hdd_context_destroy(hdd_ctx); @@ -4591,10 +4593,6 @@ void __hdd_wlan_exit(void) /* Check IPA HW Pipe shutdown */ hdd_ipa_uc_force_pipe_shutdown(hdd_ctx); -#ifdef WLAN_FEATURE_LPSS - wlan_hdd_send_status_pkg(NULL, NULL, 0, 0); -#endif - memdump_deinit(); /* Do all the cleanup before deregistering the driver */ diff --git a/core/hdd/src/wlan_hdd_power.c b/core/hdd/src/wlan_hdd_power.c index a1df43603409..9c50fbbf7101 100644 --- a/core/hdd/src/wlan_hdd_power.c +++ b/core/hdd/src/wlan_hdd_power.c @@ -1305,8 +1305,6 @@ QDF_STATUS hdd_wlan_shutdown(void) hdd_alert("WLAN driver shutting down!"); - wlan_hdd_send_status_pkg(NULL, NULL, 0, 0); - /* If SSR never completes, then do kernel panic. */ hdd_ssr_timer_init(); hdd_ssr_timer_start(HDD_SSR_BRING_UP_TIME); @@ -1352,6 +1350,8 @@ QDF_STATUS hdd_wlan_shutdown(void) wlansap_global_deinit(); hdd_wlan_stop_modules(pHddCtx, true); + wlan_hdd_send_status_pkg(NULL, NULL, 0, 0); + hdd_alert("WLAN driver shutdown complete"); return QDF_STATUS_SUCCESS; } |
