samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Fix csr_get_qo_s_from_bss_desc() context param

Browse Source 
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
This commit is contained in:
Jeff Johnson
2018-06-03 16:26:55 -07:00
parent 6e46f6d116
commit 12ec010ffe
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/sme/inc/csr_support.h
View File

@@ -216,7 +216,7 @@ bool csr_get_bss_id_bss_desc(tSirBssDescription *pSirBssDesc,
struct qdf_mac_addr *pBssId); struct qdf_mac_addr *pBssId);
bool csr_is_bss_id_equal(tSirBssDescription *pSirBssDesc1, bool csr_is_bss_id_equal(tSirBssDescription *pSirBssDesc1,
tSirBssDescription *pSirBssDesc2); tSirBssDescription *pSirBssDesc2);
eCsrMediaAccessType csr_get_qo_s_from_bss_desc(tHalHandle hHal, eCsrMediaAccessType csr_get_qos_from_bss_desc(tpAniSirGlobal mac_ctx,
tSirBssDescription *pSirBssDesc, tSirBssDescription *pSirBssDesc,
tDot11fBeaconIEs *pIes); tDot11fBeaconIEs *pIes);
bool csr_is_nullssid(uint8_t *pBssSsid, uint8_t len); bool csr_is_nullssid(uint8_t *pBssSsid, uint8_t len);

2
core/sme/src/csr/csr_api_roam.c
View File

@@ -4713,7 +4713,7 @@ QDF_STATUS csr_roam_prepare_bss_config(tpAniSirGlobal pMac,
qdf_mem_copy(&pBssConfig->BssCap, &pBssDesc->capabilityInfo, qdf_mem_copy(&pBssConfig->BssCap, &pBssDesc->capabilityInfo,
sizeof(tSirMacCapabilityInfo)); sizeof(tSirMacCapabilityInfo));
/* get qos */ /* 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 */ /* Take SSID always from profile */
qdf_mem_copy(&pBssConfig->SSID.ssId, qdf_mem_copy(&pBssConfig->SSID.ssId,
pProfile->SSIDs.SSIDList->SSID.ssId, pProfile->SSIDs.SSIDList->SSID.ssId,

6
core/sme/src/csr/csr_util.c
View File

@@ -1570,7 +1570,7 @@ static bool csr_is_bss_description_wme(tHalHandle hHal,
return fWme; return fWme;
} }
eCsrMediaAccessType csr_get_qo_s_from_bss_desc(tHalHandle hHal, eCsrMediaAccessType csr_get_qos_from_bss_desc(tpAniSirGlobal mac_ctx,
tSirBssDescription *pSirBssDesc, tSirBssDescription *pSirBssDesc,
tDot11fBeaconIEs *pIes) tDot11fBeaconIEs *pIes)
{ {
@@ -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 /* If we find WMM in the Bss Description, then we let this
* override and use WMM. * 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; qosType = eCSR_MEDIUM_ACCESS_WMM_eDCF_DSCP;
else { else {
/* If the QoS bit is on, then the AP is /* 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. * for the adapter.
*/ */
if (eCSR_MEDIUM_ACCESS_11e_eDCF == qosType if (eCSR_MEDIUM_ACCESS_11e_eDCF == qosType
&& !csr_is11e_supported(hHal)) && !csr_is11e_supported(mac_ctx))
qosType = eCSR_MEDIUM_ACCESS_DCF; qosType = eCSR_MEDIUM_ACCESS_DCF;
} }