summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYue Ma <yuem@qca.qualcomm.com>2015-07-16 18:38:08 -0700
committerAnjaneedevi Kapparapu <akappa@codeaurora.org>2015-07-22 17:02:36 +0530
commitec41fff99d91abe7a71c598e2db683a2d6fc92c2 (patch)
tree9fb4e05700261af2b7345a5007c9f38ec5ac0948
parent827f93c29203366fa1b77cc8e99b9af1416c241c (diff)
qcacld: Unset LOGP flag at proper place duing SSR re-init
Currently LOGP flag is unset a little early during SSR re-init which may cause race condition for pktlog init/exit when driver unload waits for SSR complete. Unset the flag right before re-init finishes to fix the issue. Change-Id: I70d1ffb5d0b3ef17119955bc8e511c333f2d08e9 CRs-fixed: 871091
-rw-r--r--CORE/HDD/src/wlan_hdd_early_suspend.c3
-rw-r--r--CORE/SERVICES/HIF/PCIe/if_pci.c2
2 files changed, 2 insertions, 3 deletions
diff --git a/CORE/HDD/src/wlan_hdd_early_suspend.c b/CORE/HDD/src/wlan_hdd_early_suspend.c
index 62c4b9bdbc41..91f2f30c24f5 100644
--- a/CORE/HDD/src/wlan_hdd_early_suspend.c
+++ b/CORE/HDD/src/wlan_hdd_early_suspend.c
@@ -2221,8 +2221,6 @@ VOS_STATUS hdd_wlan_re_init(void *hif_sc)
}
}
- pHddCtx->isLogpInProgress = FALSE;
- vos_set_logp_in_progress(VOS_MODULE_ID_VOSS, FALSE);
pHddCtx->hdd_mcastbcast_filter_set = FALSE;
pHddCtx->btCoexModeSet = false;
hdd_register_mcast_bcast_filter(pHddCtx);
@@ -2302,5 +2300,6 @@ err_re_init:
success:
/* Trigger replay of BTC events */
send_btc_nlink_msg(WLAN_MODULE_DOWN_IND, 0);
+ pHddCtx->isLogpInProgress = FALSE;
return VOS_STATUS_SUCCESS;
}
diff --git a/CORE/SERVICES/HIF/PCIe/if_pci.c b/CORE/SERVICES/HIF/PCIe/if_pci.c
index d87fd446b93a..8a4e60c26499 100644
--- a/CORE/SERVICES/HIF/PCIe/if_pci.c
+++ b/CORE/SERVICES/HIF/PCIe/if_pci.c
@@ -1692,7 +1692,7 @@ again:
}
#endif
-
+ vos_set_logp_in_progress(VOS_MODULE_ID_VOSS, FALSE);
printk("%s: WLAN host driver reinitiation completed!\n", __func__);
return 0;