Parcourir la source

qcacld-3.0: Reset uOsRequestedHandoff when reassoc fails

qcacld-2.0 to qcacld-3.0 propagation

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
Abhishek Singh il y a 8 ans
Parent
commit
44d3e486c7
2 fichiers modifiés avec 7 ajouts et 2 suppressions
  1. 5 1
      core/sme/src/csr/csr_neighbor_roam.c
  2. 2 1
      core/sme/src/csr/csr_roam_preauth.c

+ 5 - 1
core/sme/src/csr/csr_neighbor_roam.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2016 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.
  *
@@ -909,6 +909,7 @@ QDF_STATUS csr_neighbor_roam_indicate_disconnect(tpAniSirGlobal pMac,
 				eCSR_NEIGHBOR_ROAM_STATE_INIT, sessionId);
 			pNeighborRoamInfo->roamChannelInfo.
 				IAPPNeighborListReceived = false;
+			pNeighborRoamInfo->uOsRequestedHandoff = 0;
 		}
 		break;
 
@@ -949,6 +950,7 @@ QDF_STATUS csr_neighbor_roam_indicate_disconnect(tpAniSirGlobal pMac,
 				eCSR_NEIGHBOR_ROAM_STATE_INIT, sessionId);
 			pNeighborRoamInfo->roamChannelInfo.
 			IAPPNeighborListReceived = false;
+			pNeighborRoamInfo->uOsRequestedHandoff = 0;
 		break;
 	}
 	/*Inform the Firmware to STOP Scanning as the host has a disconnect. */
@@ -1173,6 +1175,7 @@ QDF_STATUS csr_neighbor_roam_indicate_connect(
 				eCSR_NEIGHBOR_ROAM_STATE_INIT, session_id);
 			ngbr_roam_info->roamChannelInfo.IAPPNeighborListReceived =
 				false;
+			ngbr_roam_info->uOsRequestedHandoff = 0;
 			break;
 		}
 	/* Fall through if the status is SUCCESS */
@@ -1379,6 +1382,7 @@ QDF_STATUS csr_neighbor_roam_init(tpAniSirGlobal pMac, uint8_t sessionId)
 	csr_neighbor_roam_state_transition(pMac,
 			eCSR_NEIGHBOR_ROAM_STATE_INIT, sessionId);
 	pNeighborRoamInfo->roamChannelInfo.IAPPNeighborListReceived = false;
+	pNeighborRoamInfo->uOsRequestedHandoff = 0;
 	/* Set the Last Sent Cmd as RSO_STOP */
 	pNeighborRoamInfo->last_sent_cmd = ROAM_SCAN_OFFLOAD_STOP;
 	return QDF_STATUS_SUCCESS;

+ 2 - 1
core/sme/src/csr/csr_roam_preauth.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2017 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -91,6 +91,7 @@ void csr_neighbor_roam_tranistion_preauth_done_to_disconnected(
 	csr_neighbor_roam_state_transition(mac_ctx,
 		eCSR_NEIGHBOR_ROAM_STATE_INIT, session_id);
 	pNeighborRoamInfo->roamChannelInfo.IAPPNeighborListReceived = false;
+	pNeighborRoamInfo->uOsRequestedHandoff = 0;
 }
 
 /**