Browse Source

qcacld-3.0: Fix bad csr_neighbor_middle_of_roaming() typecasts

In both csr_create_roam_scan_offload_request() and
csr_neighbor_roam_indicate_disconnect() there is a call to
csr_neighbor_middle_of_roaming() where the MAC context is typecast to
tHalHandle as part of the function call. However these typecasts are
incorrect since csr_neighbor_middle_of_roaming() expects to get a MAC
context. Due to the manner in which tHalHandle is defined this does
not current cause a build issue, but an upcoming change will enforce
type checking so update these calls to remove the inappropriate
typecasts.

Change-Id: I7eeb3eb6b4502c1934a8cffdd1d7372f93ee8ccb
CRs-Fixed: 2268176
Jeff Johnson 6 years ago
parent
commit
95f0705a72
2 changed files with 3 additions and 3 deletions
  1. 2 2
      core/sme/src/csr/csr_api_roam.c
  2. 1 1
      core/sme/src/csr/csr_neighbor_roam.c

+ 2 - 2
core/sme/src/csr/csr_api_roam.c

@@ -18414,8 +18414,8 @@ csr_create_roam_scan_offload_request(tpAniSirGlobal mac_ctx,
 		 * clear the roaming parameters that are per connection.
 		 * For a new connection, they have to be programmed again.
 		 */
-		if (csr_neighbor_middle_of_roaming((tHalHandle)mac_ctx,
-				session_id))
+		if (csr_neighbor_middle_of_roaming(mac_ctx,
+						   session_id))
 			req_buf->middle_of_roaming = 1;
 		else
 			csr_roam_reset_roam_params(mac_ctx);

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

@@ -842,7 +842,7 @@ QDF_STATUS csr_neighbor_roam_indicate_disconnect(tpAniSirGlobal pMac,
 	 * clear the roaming parameters that are per connection.
 	 * For a new connection, they have to be programmed again.
 	 */
-	if (!csr_neighbor_middle_of_roaming((tHalHandle)pMac, sessionId))
+	if (!csr_neighbor_middle_of_roaming(pMac, sessionId))
 		csr_roam_reset_roam_params(pMac);
 	if (NULL != pSession) {
 		roam_session = &pMac->roam.roamSession[sessionId];