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

qcacld-3.0: Remove alternateChannelId from assoc structs

Browse Source 
Structs sSirSmeAssocCnf and sSirSmeAssocIndToUpperLayerCnf both define
an alternateChannelId field. For both of these the field is written
but not read, and hence that usage is pointless. Since these fields
serve no purpose, remove them.

Change-Id: Icae506f3d9baea0c44896cc7dc69897bbdc236d2
CRs-Fixed: 2392273
This commit is contained in:
Jeff Johnson
2019-02-01 15:08:57 -08:00
committed by nshrivas
parent 1305f69e54
commit 85982a5e13
3 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/mac/inc/sir_api.h
View File

@@ -1141,7 +1141,6 @@ typedef struct sSirSmeAssocCnf {
struct qdf_mac_addr bssid; /* Self BSSID */ struct qdf_mac_addr bssid; /* Self BSSID */
struct qdf_mac_addr peer_macaddr; struct qdf_mac_addr peer_macaddr;
uint16_t aid; uint16_t aid;
uint8_t alternateChannelId;
} tSirSmeAssocCnf, *tpSirSmeAssocCnf; } tSirSmeAssocCnf, *tpSirSmeAssocCnf;
/* / Enum definition for Wireless medium status change codes */ /* / Enum definition for Wireless medium status change codes */

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

@@ -1186,7 +1186,6 @@ typedef struct sSirSmeAssocIndToUpperLayerCnf {
tSirMacAddr bssId; /* Self BSSID */ tSirMacAddr bssId; /* Self BSSID */
tSirMacAddr peerMacAddr; tSirMacAddr peerMacAddr;
uint16_t aid; uint16_t aid;
uint8_t alternateChannelId;
uint8_t wmmEnabledSta; /* set to true if WMM enabled STA */ uint8_t wmmEnabledSta; /* set to true if WMM enabled STA */
tSirRSNie rsnIE; /* RSN IE received from peer */ tSirRSNie rsnIE; /* RSN IE received from peer */
tSirWAPIie wapiIE; /* WAPI IE received from peer */ tSirWAPIie wapiIE; /* WAPI IE received from peer */

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

@@ -15502,9 +15502,6 @@ QDF_STATUS csr_send_assoc_cnf_msg(struct mac_context *mac, tpSirSmeAssocInd
/* aid */ /* aid */
pMsg->aid = pAssocInd->aid; pMsg->aid = pAssocInd->aid;
/* alternateChannelId */
pMsg->alternateChannelId = 11;
msg.type = pMsg->messageType; msg.type = pMsg->messageType;
msg.bodyval = 0; msg.bodyval = 0;
msg.bodyptr = pMsg; msg.bodyptr = pMsg;
@@ -15554,9 +15551,6 @@ QDF_STATUS csr_send_assoc_ind_to_upper_layer_cnf_msg(struct mac_context *mac,
pBuf = (uint8_t *)&pMsg->aid; pBuf = (uint8_t *)&pMsg->aid;
wTmp = pAssocInd->staId; wTmp = pAssocInd->staId;
qdf_mem_copy(pBuf, &wTmp, sizeof(uint16_t)); qdf_mem_copy(pBuf, &wTmp, sizeof(uint16_t));
/* alternateChannelId */
pBuf = (uint8_t *)&pMsg->alternateChannelId;
*pBuf = 11;
/* /*
* Instead of copying roam Info,just copy WmmEnabled, * Instead of copying roam Info,just copy WmmEnabled,
* RsnIE information. * RsnIE information.