Browse Source

qcacld-3.0: Remove unused fields in sCsr11rAssocNeighborInfo

numBssFromNeighborReport and neighboReportBssInfo
fields in sCsr11rAssocNeighborInfo structure are
set to 0 in multiple places but are not referenced
or overwritten.

Fix is to remove the unused fields in sCsr11rAssocNeighborInfo.

Change-Id: I1aa0e58fd8407d1f96f0bb30a122e1626051d4c3
CRs-Fixed: 2376398
Yeshwanth Sriram Guntuka 6 years ago
parent
commit
3c1399ae64

+ 1 - 4
core/sme/inc/csr_neighbor_roam.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2019 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -107,9 +107,6 @@ typedef struct sCsr11rAssocNeighborInfo {
 	uint32_t neighborReportTimeout;
 	uint8_t numPreAuthRetries;
 	tDblLinkList preAuthDoneList;   /* llist which consists/preauth nodes */
-	uint8_t numBssFromNeighborReport;
-	/* Contains info needed during REPORT_SCAN State */
-	tCsrNeighborReportBssInfo neighboReportBssInfo[MAX_BSS_IN_NEIGHBOR_RPT];
 } tCsr11rAssocNeighborInfo, *tpCsr11rAssocNeighborInfo;
 
 /* Complete control information for neighbor roam algorithm */

+ 1 - 14
core/sme/src/csr/csr_neighbor_roam.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2019 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -278,11 +278,7 @@ static void csr_neighbor_roam_reset_connected_state_control_info(
 	pNeighborRoamInfo->FTRoamInfo.currentNeighborRptRetryNum = 0;
 	pNeighborRoamInfo->FTRoamInfo.neighborRptPending = false;
 	pNeighborRoamInfo->FTRoamInfo.numPreAuthRetries = 0;
-	pNeighborRoamInfo->FTRoamInfo.numBssFromNeighborReport = 0;
 	pNeighborRoamInfo->FTRoamInfo.preauthRspPending = 0;
-	qdf_mem_zero(pNeighborRoamInfo->FTRoamInfo.neighboReportBssInfo,
-		     sizeof(tCsrNeighborReportBssInfo) *
-		     MAX_BSS_IN_NEIGHBOR_RPT);
 	pNeighborRoamInfo->uOsRequestedHandoff = 0;
 	qdf_mem_zero(&pNeighborRoamInfo->handoffReqInfo,
 		     sizeof(tCsrHandoffRequest));
@@ -1186,11 +1182,6 @@ static QDF_STATUS csr_neighbor_roam_init11r_assoc_info(struct mac_context *mac)
 		pFTRoamInfo->preauthRspPending = false;
 
 		pFTRoamInfo->currentNeighborRptRetryNum = 0;
-		pFTRoamInfo->numBssFromNeighborReport = 0;
-
-		qdf_mem_zero(pFTRoamInfo->neighboReportBssInfo,
-			     sizeof(tCsrNeighborReportBssInfo) *
-			     MAX_BSS_IN_NEIGHBOR_RPT);
 
 		status = csr_ll_open(&pFTRoamInfo->preAuthDoneList);
 		if (QDF_STATUS_SUCCESS != status) {
@@ -1381,10 +1372,6 @@ void csr_neighbor_roam_close(struct mac_context *mac, uint8_t sessionId)
 	csr_release_profile(mac, &pNeighborRoamInfo->csrNeighborRoamProfile);
 	csr_roam_free_connect_profile(&pNeighborRoamInfo->prevConnProfile);
 	pNeighborRoamInfo->FTRoamInfo.currentNeighborRptRetryNum = 0;
-	pNeighborRoamInfo->FTRoamInfo.numBssFromNeighborReport = 0;
-	qdf_mem_zero(pNeighborRoamInfo->FTRoamInfo.neighboReportBssInfo,
-		     sizeof(tCsrNeighborReportBssInfo) *
-		     MAX_BSS_IN_NEIGHBOR_RPT);
 	csr_neighbor_roam_free_roamable_bss_list(mac,
 						 &pNeighborRoamInfo->FTRoamInfo.
 						 preAuthDoneList);

+ 1 - 5
core/sme/src/csr/csr_roam_preauth.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2019 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -176,10 +176,6 @@ void csr_neighbor_roam_reset_preauth_control_info(struct mac_context *mac_ctx,
 	neigh_roam_info->FTRoamInfo.numPreAuthRetries = 0;
 	neigh_roam_info->FTRoamInfo.currentNeighborRptRetryNum = 0;
 	neigh_roam_info->FTRoamInfo.neighborRptPending = false;
-	neigh_roam_info->FTRoamInfo.numBssFromNeighborReport = 0;
-	qdf_mem_zero(neigh_roam_info->FTRoamInfo.neighboReportBssInfo,
-		     sizeof(tCsrNeighborReportBssInfo) *
-		     MAX_BSS_IN_NEIGHBOR_RPT);
 	neigh_roam_info->uOsRequestedHandoff = 0;
 	qdf_mem_zero(&neigh_roam_info->handoffReqInfo,
 		     sizeof(tCsrHandoffRequest));