Browse Source

qcacmn: Fix DFS component KW issues

Fix KW issues for DFS component.

Change-Id: I9285c79e33f637d99c765e76dff35609235f1255
CRs-Fixed: 2136241
Abhijit Pradhan 7 years ago
parent
commit
c5fc03dc59
2 changed files with 2 additions and 22 deletions
  1. 1 21
      umac/dfs/core/src/misc/dfs.c
  2. 1 1
      umac/dfs/dispatcher/src/wlan_dfs_tgt_api.c

+ 1 - 21
umac/dfs/core/src/misc/dfs.c

@@ -677,28 +677,8 @@ int dfs_control(struct wlan_dfs *dfs,
 
 	qdf_mem_zero(&dfs_unit_test, sizeof(dfs_unit_test));
 
-	/* dfs is dereferenced (dfs->dfs_ignore_dfs) when dfs is NULL */
 	if (!dfs) {
-		dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS,  "dfs is NULL");
-		/*
-		 * Enable/Disable DFS can be done prior to attach,
-		 * So handle here.
-		 */
-		switch (id) {
-		case DFS_DISABLE_DETECT:
-			dfs->dfs_ignore_dfs = 1;
-			dfs_info(dfs, WLAN_DEBUG_DFS_ALWAYS, "enable detects, ignore_dfs %d",
-					dfs->dfs_ignore_dfs ? 1:0);
-			break;
-		case DFS_ENABLE_DETECT:
-			dfs->dfs_ignore_dfs = 0;
-			dfs_info(dfs, WLAN_DEBUG_DFS_ALWAYS, "enable detects, ignore_dfs %d",
-					dfs->dfs_ignore_dfs ? 1:0);
-			break;
-		default:
-			error = -EINVAL;
-			break;
-		}
+		dfs_err(NULL, WLAN_DEBUG_DFS_ALWAYS,  "dfs is NULL");
 		goto bad;
 	}
 

+ 1 - 1
umac/dfs/dispatcher/src/wlan_dfs_tgt_api.c

@@ -219,7 +219,7 @@ QDF_STATUS tgt_dfs_process_radar_ind(struct wlan_objmgr_pdev *pdev,
 	struct wlan_dfs *dfs;
 
 	if (!pdev) {
-		dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS,  "null pdev");
+		dfs_err(NULL, WLAN_DEBUG_DFS_ALWAYS,  "null pdev");
 		return QDF_STATUS_E_FAILURE;
 	}