From 1305f69e54209f940046c4c321163b293b1ea526 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Fri, 1 Feb 2019 14:57:55 -0800 Subject: [PATCH] qcacld-3.0: Remove "alternate bssid" from assoc structs Structs sSirSmeAssocCnf and sSirSmeAssocIndToUpperLayerCnf both define an "alternate bssid" field, but only one of them is actually used. And even there the field is written but not read, and hence that usage is pointless. Since these fields serve no purpose, remove them. Change-Id: I0591ac51d724c8195cf3dda75609a46429676bfd CRs-Fixed: 2392272 --- core/mac/inc/sir_api.h | 1 - core/sme/inc/csr_api.h | 1 - core/sme/src/csr/csr_api_roam.c | 8 +------- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h index ddffd0454c..ac03ab522b 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; - struct qdf_mac_addr alternate_bssid; uint8_t alternateChannelId; } tSirSmeAssocCnf, *tpSirSmeAssocCnf; diff --git a/core/sme/inc/csr_api.h b/core/sme/inc/csr_api.h index 8d3e61d907..49a37cf79e 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; - tSirMacAddr alternateBssId; uint8_t alternateChannelId; uint8_t wmmEnabledSta; /* set to true if WMM enabled STA */ tSirRSNie rsnIE; /* RSN 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 317d46f21b..6ea87192c6 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -15501,9 +15501,7 @@ QDF_STATUS csr_send_assoc_cnf_msg(struct mac_context *mac, tpSirSmeAssocInd QDF_MAC_ADDR_SIZE); /* aid */ pMsg->aid = pAssocInd->aid; - /* alternateBssId */ - qdf_mem_copy(pMsg->alternate_bssid.bytes, pAssocInd->bssId, - QDF_MAC_ADDR_SIZE); + /* alternateChannelId */ pMsg->alternateChannelId = 11; @@ -15556,10 +15554,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)); - /* alternateBssId */ - pBuf = (uint8_t *)&pMsg->alternateBssId; - qdf_mem_copy((tSirMacAddr *)pBuf, pAssocInd->bssId, - sizeof(tSirMacAddr)); /* alternateChannelId */ pBuf = (uint8_t *)&pMsg->alternateChannelId; *pBuf = 11;