mirror of
https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
synced 2024-09-21 03:43:03 +00:00
qcacld-2.0: Reset uOsRequestedHandoff when reassoc fails
uOsRequestedHandoff is not reset in many scenarios after reassoc fails/timeout. Due to this if the next connect request initiate scan for ssid to find the AP in local cache, the scan for ssid complete handler think that OS requested handoff is in progress and returns without initiating the connect or connect failure. Thus the HDD remains in connecting state and after that scans fails. To fix this reset uOsRequestedHandoff whenever reassoc fails Change-Id: Ife9ee885cc1638f2bc4e02fd91b000c6e00f0689 CRs-Fixed: 1101706
This commit is contained in:
parent
bdeaacb429
commit
f4705ac2e0
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2011-2015 The Linux Foundation. All rights reserved.
|
* Copyright (c) 2011-2017 The Linux Foundation. All rights reserved.
|
||||||
*
|
*
|
||||||
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
|
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
|
||||||
*
|
*
|
||||||
|
@ -4994,6 +4994,9 @@ eHalStatus csrNeighborRoamIndicateDisconnect(tpAniSirGlobal pMac,
|
||||||
eCSR_NEIGHBOR_ROAM_STATE_INIT,
|
eCSR_NEIGHBOR_ROAM_STATE_INIT,
|
||||||
sessionId);
|
sessionId);
|
||||||
pNeighborRoamInfo->roamChannelInfo.IAPPNeighborListReceived = eANI_BOOLEAN_FALSE;
|
pNeighborRoamInfo->roamChannelInfo.IAPPNeighborListReceived = eANI_BOOLEAN_FALSE;
|
||||||
|
#ifdef WLAN_FEATURE_ROAM_SCAN_OFFLOAD
|
||||||
|
pNeighborRoamInfo->uOsRequestedHandoff = 0;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -5030,6 +5033,7 @@ eHalStatus csrNeighborRoamIndicateDisconnect(tpAniSirGlobal pMac,
|
||||||
pNeighborRoamInfo->roamChannelInfo.IAPPNeighborListReceived = eANI_BOOLEAN_FALSE;
|
pNeighborRoamInfo->roamChannelInfo.IAPPNeighborListReceived = eANI_BOOLEAN_FALSE;
|
||||||
csrNeighborRoamResetCfgListChanScanControlInfo(pMac, sessionId);
|
csrNeighborRoamResetCfgListChanScanControlInfo(pMac, sessionId);
|
||||||
#ifdef WLAN_FEATURE_ROAM_SCAN_OFFLOAD
|
#ifdef WLAN_FEATURE_ROAM_SCAN_OFFLOAD
|
||||||
|
pNeighborRoamInfo->uOsRequestedHandoff = 0;
|
||||||
if (!csrRoamIsRoamOffloadScanEnabled(pMac))
|
if (!csrRoamIsRoamOffloadScanEnabled(pMac))
|
||||||
{
|
{
|
||||||
#endif
|
#endif
|
||||||
|
@ -5067,6 +5071,9 @@ eHalStatus csrNeighborRoamIndicateDisconnect(tpAniSirGlobal pMac,
|
||||||
CSR_NEIGHBOR_ROAM_STATE_TRANSITION(eCSR_NEIGHBOR_ROAM_STATE_INIT,
|
CSR_NEIGHBOR_ROAM_STATE_TRANSITION(eCSR_NEIGHBOR_ROAM_STATE_INIT,
|
||||||
sessionId)
|
sessionId)
|
||||||
pNeighborRoamInfo->roamChannelInfo.IAPPNeighborListReceived = eANI_BOOLEAN_FALSE;
|
pNeighborRoamInfo->roamChannelInfo.IAPPNeighborListReceived = eANI_BOOLEAN_FALSE;
|
||||||
|
#ifdef WLAN_FEATURE_ROAM_SCAN_OFFLOAD
|
||||||
|
pNeighborRoamInfo->uOsRequestedHandoff = 0;
|
||||||
|
#endif
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
#ifdef WLAN_FEATURE_ROAM_SCAN_OFFLOAD
|
#ifdef WLAN_FEATURE_ROAM_SCAN_OFFLOAD
|
||||||
|
@ -5195,6 +5202,9 @@ eHalStatus csrNeighborRoamIndicateConnect(tpAniSirGlobal pMac,
|
||||||
eCSR_NEIGHBOR_ROAM_STATE_INIT,
|
eCSR_NEIGHBOR_ROAM_STATE_INIT,
|
||||||
sessionId)
|
sessionId)
|
||||||
pNeighborRoamInfo->roamChannelInfo.IAPPNeighborListReceived = eANI_BOOLEAN_FALSE;
|
pNeighborRoamInfo->roamChannelInfo.IAPPNeighborListReceived = eANI_BOOLEAN_FALSE;
|
||||||
|
#ifdef WLAN_FEATURE_ROAM_SCAN_OFFLOAD
|
||||||
|
pNeighborRoamInfo->uOsRequestedHandoff = 0;
|
||||||
|
#endif
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
/* Fall through if the status is SUCCESS */
|
/* Fall through if the status is SUCCESS */
|
||||||
|
@ -5620,6 +5630,9 @@ eHalStatus csrNeighborRoamInit(tpAniSirGlobal pMac, tANI_U8 sessionId)
|
||||||
pNeighborRoamInfo->roamChannelInfo.IAPPNeighborListReceived = eANI_BOOLEAN_FALSE;
|
pNeighborRoamInfo->roamChannelInfo.IAPPNeighborListReceived = eANI_BOOLEAN_FALSE;
|
||||||
/* Set the Last Sent Cmd as RSO_STOP */
|
/* Set the Last Sent Cmd as RSO_STOP */
|
||||||
pNeighborRoamInfo->lastSentCmd = ROAM_SCAN_OFFLOAD_STOP;
|
pNeighborRoamInfo->lastSentCmd = ROAM_SCAN_OFFLOAD_STOP;
|
||||||
|
#ifdef WLAN_FEATURE_ROAM_SCAN_OFFLOAD
|
||||||
|
pNeighborRoamInfo->uOsRequestedHandoff = 0;
|
||||||
|
#endif
|
||||||
return eHAL_STATUS_SUCCESS;
|
return eHAL_STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -5970,6 +5983,9 @@ void csrNeighborRoamTranistionPreauthDoneToDisconnected(tpAniSirGlobal pMac,
|
||||||
// Transition to init state
|
// Transition to init state
|
||||||
CSR_NEIGHBOR_ROAM_STATE_TRANSITION(eCSR_NEIGHBOR_ROAM_STATE_INIT, sessionId)
|
CSR_NEIGHBOR_ROAM_STATE_TRANSITION(eCSR_NEIGHBOR_ROAM_STATE_INIT, sessionId)
|
||||||
pNeighborRoamInfo->roamChannelInfo.IAPPNeighborListReceived = eANI_BOOLEAN_FALSE;
|
pNeighborRoamInfo->roamChannelInfo.IAPPNeighborListReceived = eANI_BOOLEAN_FALSE;
|
||||||
|
#ifdef WLAN_FEATURE_ROAM_SCAN_OFFLOAD
|
||||||
|
pNeighborRoamInfo->uOsRequestedHandoff = 0;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ---------------------------------------------------------------------------
|
/* ---------------------------------------------------------------------------
|
||||||
|
|
Loading…
Reference in a new issue