From 12ec010ffeefdcc4b686fb9d06dffa4cb3da0e73 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Sun, 3 Jun 2018 16:26:55 -0700 Subject: [PATCH] qcacld-3.0: Fix csr_get_qo_s_from_bss_desc() context param Currently csr_get_qo_s_from_bss_desc() takes a tHalHandle context param. However CSR is an internal module, and hence it should be using the "real" context pointer type tpAniSirGlobal instead of the opaque reference tHalhandle, so update the API. In addition change "qo_s" to "qos" to fix the typo in the name. Change-Id: Ib5f53d55737138c708d47e79a68a2b1344dff5d2 CRs-Fixed: 2255547 --- core/sme/inc/csr_support.h | 6 +++--- core/sme/src/csr/csr_api_roam.c | 2 +- core/sme/src/csr/csr_util.c | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/core/sme/inc/csr_support.h b/core/sme/inc/csr_support.h index ac814f300379..ea2b3df03f9b 100644 --- a/core/sme/inc/csr_support.h +++ b/core/sme/inc/csr_support.h @@ -216,9 +216,9 @@ bool csr_get_bss_id_bss_desc(tSirBssDescription *pSirBssDesc, struct qdf_mac_addr *pBssId); bool csr_is_bss_id_equal(tSirBssDescription *pSirBssDesc1, tSirBssDescription *pSirBssDesc2); -eCsrMediaAccessType csr_get_qo_s_from_bss_desc(tHalHandle hHal, - tSirBssDescription *pSirBssDesc, - tDot11fBeaconIEs *pIes); +eCsrMediaAccessType csr_get_qos_from_bss_desc(tpAniSirGlobal mac_ctx, + tSirBssDescription *pSirBssDesc, + tDot11fBeaconIEs *pIes); bool csr_is_nullssid(uint8_t *pBssSsid, uint8_t len); bool csr_is_infra_bss_desc(tSirBssDescription *pSirBssDesc); bool csr_is_ibss_bss_desc(tSirBssDescription *pSirBssDesc); diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 9af477730d0f..a5fd731539e3 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -4713,7 +4713,7 @@ QDF_STATUS csr_roam_prepare_bss_config(tpAniSirGlobal pMac, qdf_mem_copy(&pBssConfig->BssCap, &pBssDesc->capabilityInfo, sizeof(tSirMacCapabilityInfo)); /* get qos */ - pBssConfig->qosType = csr_get_qo_s_from_bss_desc(pMac, pBssDesc, pIes); + pBssConfig->qosType = csr_get_qos_from_bss_desc(pMac, pBssDesc, pIes); /* Take SSID always from profile */ qdf_mem_copy(&pBssConfig->SSID.ssId, pProfile->SSIDs.SSIDList->SSID.ssId, diff --git a/core/sme/src/csr/csr_util.c b/core/sme/src/csr/csr_util.c index 821c3c80ec63..89d093bafcb1 100644 --- a/core/sme/src/csr/csr_util.c +++ b/core/sme/src/csr/csr_util.c @@ -1570,9 +1570,9 @@ static bool csr_is_bss_description_wme(tHalHandle hHal, return fWme; } -eCsrMediaAccessType csr_get_qo_s_from_bss_desc(tHalHandle hHal, - tSirBssDescription *pSirBssDesc, - tDot11fBeaconIEs *pIes) +eCsrMediaAccessType csr_get_qos_from_bss_desc(tpAniSirGlobal mac_ctx, + tSirBssDescription *pSirBssDesc, + tDot11fBeaconIEs *pIes) { eCsrMediaAccessType qosType = eCSR_MEDIUM_ACCESS_DCF; @@ -1585,7 +1585,7 @@ eCsrMediaAccessType csr_get_qo_s_from_bss_desc(tHalHandle hHal, /* If we find WMM in the Bss Description, then we let this * override and use WMM. */ - if (csr_is_bss_description_wme(hHal, pSirBssDesc, pIes)) + if (csr_is_bss_description_wme(mac_ctx, pSirBssDesc, pIes)) qosType = eCSR_MEDIUM_ACCESS_WMM_eDCF_DSCP; else { /* If the QoS bit is on, then the AP is @@ -1600,7 +1600,7 @@ eCsrMediaAccessType csr_get_qo_s_from_bss_desc(tHalHandle hHal, * for the adapter. */ if (eCSR_MEDIUM_ACCESS_11e_eDCF == qosType - && !csr_is11e_supported(hHal)) + && !csr_is11e_supported(mac_ctx)) qosType = eCSR_MEDIUM_ACCESS_DCF; }