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

qcacld-3.0: Cleanup CBMode in SME

Browse Source 
Cleanup the variable CBMode as there is no usage of
the variable in the code

Change-Id: I4e63a0f6f1cddd639f324c177b198e4b5c18e9e0
CRs-Fixed: 2063149
This commit is contained in:
Varun Reddy Yeturu
2017-06-15 15:00:30 -07:00
committed by snandini
parent 8c68b47fa6
commit 0d3d9916c4
4 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/sap/src/sap_fsm.c
View File

@@ -3708,8 +3708,6 @@ sapconvert_to_csr_profile(tsap_Config_t *pconfig_params, eCsrRoamBssType bssType
pconfig_params->RSNWPAReqIELength); pconfig_params->RSNWPAReqIELength);
profile->nRSNReqIELength = pconfig_params->RSNWPAReqIELength; profile->nRSNReqIELength = pconfig_params->RSNWPAReqIELength;
} }
/* Turn off CB mode */
profile->CBMode = eCSR_CB_OFF;
/* set the phyMode to accept anything */ /* set the phyMode to accept anything */
/* Best means everything because it covers all the things we support */ /* Best means everything because it covers all the things we support */

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

@@ -922,7 +922,6 @@ typedef struct tagCsrRoamProfile {
uint8_t MFPCapable; uint8_t MFPCapable;
#endif #endif
tCsrKeys Keys; tCsrKeys Keys;
eCsrCBChoice CBMode;
tCsrChannelInfo ChannelInfo; tCsrChannelInfo ChannelInfo;
uint8_t operationChannel; uint8_t operationChannel;
struct ch_params ch_params; struct ch_params ch_params;
@@ -1012,7 +1011,6 @@ typedef struct tagCsrRoamConnectedProfile {
tCsrEncryptionList EncryptionInfo; tCsrEncryptionList EncryptionInfo;
eCsrEncryptionType mcEncryptionType; eCsrEncryptionType mcEncryptionType;
tCsrEncryptionList mcEncryptionInfo; tCsrEncryptionList mcEncryptionInfo;
eCsrCBChoice CBMode;
uint8_t operationChannel; uint8_t operationChannel;
uint32_t vht_channel_width; uint32_t vht_channel_width;
uint16_t beaconInterval; uint16_t beaconInterval;

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

@@ -1176,7 +1176,6 @@ QDF_STATUS csr_roam_copy_connect_profile(tpAniSirGlobal pMac,
pProfile->mcEncryptionType = connected_prof->mcEncryptionType; pProfile->mcEncryptionType = connected_prof->mcEncryptionType;
pProfile->BSSType = connected_prof->BSSType; pProfile->BSSType = connected_prof->BSSType;
pProfile->operationChannel = connected_prof->operationChannel; pProfile->operationChannel = connected_prof->operationChannel;
pProfile->CBMode = connected_prof->CBMode;
qdf_mem_copy(&pProfile->bssid, &connected_prof->bssid, qdf_mem_copy(&pProfile->bssid, &connected_prof->bssid,
sizeof(struct qdf_mac_addr)); sizeof(struct qdf_mac_addr));
qdf_mem_copy(&pProfile->SSID, &connected_prof->SSID, qdf_mem_copy(&pProfile->SSID, &connected_prof->SSID,
@@ -7577,7 +7576,6 @@ QDF_STATUS csr_roam_copy_profile(tpAniSirGlobal pMac,
if (pDstProfile->phyMode & eCSR_DOT11_MODE_11n) if (pDstProfile->phyMode & eCSR_DOT11_MODE_11n)
pDstProfile->phyMode &= ~eCSR_DOT11_MODE_11n; pDstProfile->phyMode &= ~eCSR_DOT11_MODE_11n;
#endif /* FEATURE_WLAN_WAPI */ #endif /* FEATURE_WLAN_WAPI */
pDstProfile->CBMode = pSrcProfile->CBMode;
pDstProfile->ch_params.ch_width = pSrcProfile->ch_params.ch_width; pDstProfile->ch_params.ch_width = pSrcProfile->ch_params.ch_width;
pDstProfile->ch_params.center_freq_seg0 = pDstProfile->ch_params.center_freq_seg0 =
pSrcProfile->ch_params.center_freq_seg0; pSrcProfile->ch_params.center_freq_seg0;
@@ -7714,7 +7712,6 @@ QDF_STATUS csr_roam_copy_connected_profile(tpAniSirGlobal pMac,
pDstProfile->negotiatedMCEncryptionType = pDstProfile->negotiatedMCEncryptionType =
pSrcProfile->mcEncryptionType; pSrcProfile->mcEncryptionType;
pDstProfile->BSSType = pSrcProfile->BSSType; pDstProfile->BSSType = pSrcProfile->BSSType;
pDstProfile->CBMode = pSrcProfile->CBMode;
qdf_mem_copy(&pDstProfile->Keys, &pSrcProfile->Keys, qdf_mem_copy(&pDstProfile->Keys, &pSrcProfile->Keys,
sizeof(pDstProfile->Keys)); sizeof(pDstProfile->Keys));
if (pSrcProfile->MDID.mdiePresent) { if (pSrcProfile->MDID.mdiePresent) {
@@ -8643,12 +8640,6 @@ QDF_STATUS csr_roam_save_connected_infomation(tpAniSirGlobal pMac,
pConnectProfile->MFPCapable = pProfile->MFPCapable; pConnectProfile->MFPCapable = pProfile->MFPCapable;
#endif #endif
} }
if (pIes)
pConnectProfile->CBMode = csr_get_cb_mode_from_ies(pMac,
pSirBssDesc->channelId, pIes);
else
sme_err("IE unavailable to derive CB mode");
/* Save bssid */ /* Save bssid */
pConnectProfile->operationChannel = pSirBssDesc->channelId; pConnectProfile->operationChannel = pSirBssDesc->channelId;
pConnectProfile->beaconInterval = pSirBssDesc->beaconInterval; pConnectProfile->beaconInterval = pSirBssDesc->beaconInterval;

1
core/sme/src/nan/nan_datapath_api.c
View File

@@ -372,7 +372,6 @@ void csr_roam_save_ndi_connected_info(tpAniSirGlobal mac_ctx,
sizeof(connect_profile), 0); sizeof(connect_profile), 0);
connect_profile->AuthType = roam_profile->negotiatedAuthType; connect_profile->AuthType = roam_profile->negotiatedAuthType;
connect_profile->AuthInfo = roam_profile->AuthType; connect_profile->AuthInfo = roam_profile->AuthType;
connect_profile->CBMode = roam_profile->CBMode;
connect_profile->EncryptionType = connect_profile->EncryptionType =
roam_profile->negotiatedUCEncryptionType; roam_profile->negotiatedUCEncryptionType;
connect_profile->EncryptionInfo = roam_profile->EncryptionType; connect_profile->EncryptionInfo = roam_profile->EncryptionType;