qcacld-2.0: Remove roc context when shutting down wlan during ssr
Remain on channel context should be removed as p2p if wlan is
shutdown when roc is in progress, or else there will be status
inconsistency of roc and p2p will be hang up when system is
started again during ssr test.
Change-Id: Iae235cf27a7fe7949abd1b57e397bbe8e750976f
CRs-Fixed: 2146132
diff --git a/CORE/HDD/src/wlan_hdd_p2p.c b/CORE/HDD/src/wlan_hdd_p2p.c
index 70c09dc..363d1a1 100644
--- a/CORE/HDD/src/wlan_hdd_p2p.c
+++ b/CORE/HDD/src/wlan_hdd_p2p.c
@@ -668,9 +668,15 @@
hdd_cfg80211_state_t *cfgState = WLAN_HDD_GET_CFG_STATE_PTR( pAdapter );
hdd_remain_on_chan_ctx_t *pRemainChanCtx;
hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(pAdapter);
+ int ret_code;
- if (0 != wlan_hdd_validate_context(hdd_ctx))
- return eHAL_STATUS_FAILURE;
+ ret_code = wlan_hdd_validate_context(hdd_ctx);
+ if (0 != ret_code) {
+ /* If ssr is inprogress, do not return, resource release is necessary */
+ if (!(-EAGAIN == ret_code && hdd_ctx->isLogpInProgress)) {
+ return eHAL_STATUS_FAILURE;
+ }
+ }
mutex_lock(&cfgState->remain_on_chan_ctx_lock);
pRemainChanCtx = cfgState->remain_on_chan_ctx;
@@ -736,7 +742,9 @@
* after sending any cancel remain on channel event will also
* ensure that the cancel roc is sent without any delays.
*/
- schedule_delayed_work(&hdd_ctx->rocReqWork, 0);
+ /* If ssr is inprogress, do not schedule next roc req */
+ if (!hdd_ctx->isLogpInProgress)
+ schedule_delayed_work(&hdd_ctx->rocReqWork, 0);
if ( ( WLAN_HDD_INFRA_STATION == pAdapter->device_mode ) ||
( WLAN_HDD_P2P_CLIENT == pAdapter->device_mode ) ||
