From b9307a930e3275ce303d146a64a387bbcdfad9db Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Sun, 3 Jun 2018 11:22:32 -0700 Subject: [PATCH] qcacld-3.0: Remove unused csr_is_ssid_in_list() param The hHal parameter to csr_is_ssid_in_list() is unused, so remove it. Change-Id: I8b08acb52e719f393543da593ddc421965c8b6c0 CRs-Fixed: 2255483 --- core/sme/inc/csr_support.h | 3 +-- core/sme/src/csr/csr_api_roam.c | 8 ++++---- core/sme/src/csr/csr_util.c | 3 +-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/core/sme/inc/csr_support.h b/core/sme/inc/csr_support.h index 239003d851b1..438eb2be5ccf 100644 --- a/core/sme/inc/csr_support.h +++ b/core/sme/inc/csr_support.h @@ -256,8 +256,7 @@ bool csr_is_ssid_equal(tHalHandle hHal, tSirBssDescription *pSirBssDesc1, tSirBssDescription *pSirBssDesc2, tDot11fBeaconIEs *pIes2); /* Null ssid means match */ -bool csr_is_ssid_in_list(tHalHandle hHal, tSirMacSSid *pSsid, - tCsrSSIDs *pSsidList); +bool csr_is_ssid_in_list(tSirMacSSid *pSsid, tCsrSSIDs *pSsidList); bool csr_is_profile_wpa(struct csr_roam_profile *pProfile); bool csr_is_profile_rsn(struct csr_roam_profile *pProfile); /* diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 15adb01a924c..0c56d2616407 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -8784,8 +8784,9 @@ QDF_STATUS csr_roam_connect(tpAniSirGlobal pMac, uint32_t sessionId, csr_roam_remove_duplicate_command(pMac, sessionId, NULL, eCsrHddIssued); /* Check whether ssid changes */ if (csr_is_conn_state_connected(pMac, sessionId) && - pProfile->SSIDs.numOfSSIDs && !csr_is_ssid_in_list(pMac, - &pSession->connectedProfile.SSID, &pProfile->SSIDs)) + pProfile->SSIDs.numOfSSIDs && + !csr_is_ssid_in_list(&pSession->connectedProfile.SSID, + &pProfile->SSIDs)) csr_roam_issue_disassociate_cmd(pMac, sessionId, eCSR_DISCONNECT_REASON_UNSPECIFIED); /* @@ -8991,8 +8992,7 @@ csr_roam_reassoc(tpAniSirGlobal mac_ctx, uint32_t session_id, if (csr_is_conn_state_connected(mac_ctx, session_id)) { if (profile) { if (profile->SSIDs.numOfSSIDs && - csr_is_ssid_in_list(mac_ctx, - &session->connectedProfile.SSID, + csr_is_ssid_in_list(&session->connectedProfile.SSID, &profile->SSIDs)) { fCallCallback = false; } else { diff --git a/core/sme/src/csr/csr_util.c b/core/sme/src/csr/csr_util.c index 1703a04442a7..65a6774bcc1a 100644 --- a/core/sme/src/csr/csr_util.c +++ b/core/sme/src/csr/csr_util.c @@ -5307,8 +5307,7 @@ bool csr_is_ssid_match(tpAniSirGlobal pMac, uint8_t *ssid1, uint8_t ssid1Len, } /* Null ssid means match */ -bool csr_is_ssid_in_list(tHalHandle hHal, tSirMacSSid *pSsid, - tCsrSSIDs *pSsidList) +bool csr_is_ssid_in_list(tSirMacSSid *pSsid, tCsrSSIDs *pSsidList) { bool fMatch = false; uint32_t i;