From 95f0705a7273aa3e7ee3de5822058c883a9b1950 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Sun, 10 Jun 2018 15:47:09 -0700 Subject: [PATCH] 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 --- core/sme/src/csr/csr_api_roam.c | 4 ++-- core/sme/src/csr/csr_neighbor_roam.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 786f8aaf722a6..a40a12244a26d 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/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); diff --git a/core/sme/src/csr/csr_neighbor_roam.c b/core/sme/src/csr/csr_neighbor_roam.c index 869723d651828..0994cda1abf7c 100644 --- a/core/sme/src/csr/csr_neighbor_roam.c +++ b/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];