From 85982a5e13e565f9767cc8668ddbde97004d29a3 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Fri, 1 Feb 2019 15:08:57 -0800 Subject: [PATCH] qcacld-3.0: Remove alternateChannelId from assoc structs 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 --- core/mac/inc/sir_api.h | 1 - core/sme/inc/csr_api.h | 1 - core/sme/src/csr/csr_api_roam.c | 6 ------ 3 files changed, 8 deletions(-) diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h index ac03ab522b..61bca2609e 100644 --- a/core/mac/inc/sir_api.h +++ b/core/mac/inc/sir_api.h @@ -1141,7 +1141,6 @@ typedef struct sSirSmeAssocCnf { struct qdf_mac_addr bssid; /* Self BSSID */ struct qdf_mac_addr peer_macaddr; uint16_t aid; - uint8_t alternateChannelId; } tSirSmeAssocCnf, *tpSirSmeAssocCnf; /* / Enum definition for Wireless medium status change codes */ diff --git a/core/sme/inc/csr_api.h b/core/sme/inc/csr_api.h index 49a37cf79e..3ce2fbdc23 100644 --- a/core/sme/inc/csr_api.h +++ b/core/sme/inc/csr_api.h @@ -1186,7 +1186,6 @@ typedef struct sSirSmeAssocIndToUpperLayerCnf { tSirMacAddr bssId; /* Self BSSID */ tSirMacAddr peerMacAddr; uint16_t aid; - uint8_t alternateChannelId; uint8_t wmmEnabledSta; /* set to true if WMM enabled STA */ tSirRSNie rsnIE; /* RSN IE received from peer */ tSirWAPIie wapiIE; /* WAPI IE received from peer */ diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 6ea87192c6..71d13238a1 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -15502,9 +15502,6 @@ QDF_STATUS csr_send_assoc_cnf_msg(struct mac_context *mac, tpSirSmeAssocInd /* aid */ pMsg->aid = pAssocInd->aid; - /* alternateChannelId */ - pMsg->alternateChannelId = 11; - msg.type = pMsg->messageType; msg.bodyval = 0; 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; wTmp = pAssocInd->staId; qdf_mem_copy(pBuf, &wTmp, sizeof(uint16_t)); - /* alternateChannelId */ - pBuf = (uint8_t *)&pMsg->alternateChannelId; - *pBuf = 11; /* * Instead of copying roam Info,just copy WmmEnabled, * RsnIE information.