浏览代码

qcacld-3.0: Remove redundant logic in csr_is_valid_channel

sapDfsChannelNolList and numCurrentRegDomainDfsChannels
fields in sap dfs info is not populated and is used in
csr_is_valid_channel.

Fix is to remove the redundant logic in csr_is_valid_channel.

Change-Id: Ib98423ba910a1947a908f4a74762f82183aa89d5
CRs-Fixed: 2374080
Yeshwanth Sriram Guntuka 6 年之前
父节点
当前提交
261ac4d56e
共有 2 个文件被更改,包括 0 次插入23 次删除
  1. 0 2
      core/sap/inc/sap_api.h
  2. 0 21
      core/sme/src/csr/csr_api_roam.c

+ 0 - 2
core/sap/inc/sap_api.h

@@ -626,8 +626,6 @@ typedef struct sSapDfsInfo {
 	 * generation and transmission
 	 */
 	uint8_t csaIERequired;
-	uint8_t numCurrentRegDomainDfsChannels;
-	tSapDfsNolInfo sapDfsChannelNolList[NUM_5GHZ_CHANNELS];
 	uint8_t is_dfs_cac_timer_running;
 	/*
 	 * New channel width and new channel bonding mode

+ 0 - 21
core/sme/src/csr/csr_api_roam.c

@@ -2852,27 +2852,6 @@ QDF_STATUS csr_is_valid_channel(struct mac_context *mac, uint8_t chnNum)
 		}
 	}
 
-	if (status == QDF_STATUS_SUCCESS) {
-		/* dfs nol */
-		for (index = 0;
-		     index <
-		     mac->sap.SapDfsInfo.numCurrentRegDomainDfsChannels;
-		     index++) {
-			tSapDfsNolInfo *dfsChan = &mac->sap.SapDfsInfo.
-						sapDfsChannelNolList[index];
-			if ((dfsChan->dfs_channel_number == chnNum)
-			    && (dfsChan->radar_status_flag ==
-				eSAP_DFS_CHANNEL_UNAVAILABLE)) {
-				QDF_TRACE(QDF_MODULE_ID_SME,
-					  QDF_TRACE_LEVEL_ERROR,
-					 FL("channel %d is in dfs nol"),
-					  chnNum);
-				status = QDF_STATUS_E_FAILURE;
-				break;
-			}
-		}
-	}
-
 	if (QDF_STATUS_SUCCESS != status) {
 		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			 FL("channel %d is not available"), chnNum);