qcacmn: Redefine conditions to skip CAC

Find out if a VAP is going through restart transition and skip CAC.
All other cases, do not skip CAC based on subset logic.
Also, if the channel is non-DFS, do not do CAC.

CRs-Fixed: 2945741
Change-Id: I5a9de47a879eb8d294dfed126a77970c52b2b546

umac/dfs/dispatcher/inc/wlan_dfs_utils_api.h

@@ -857,6 +857,8 @@ bool utils_dfs_is_cac_required(struct wlan_objmgr_pdev *pdev,
  * @continue_current_cac: If AP can start CAC then this variable indicates
  * whether to continue with the current CAC or restart the CAC. This variable
  * is valid only if this function returns true.
+ * @is_vap_restart: Flag to indicate if vap is restarted/started.
+ * True: VAP restart. False: VAP start
  *
  * This API checks if the dfs_curchan is a subset of the dfs_prevchan.
  * dfs_curchan and dfs_prevchan are updated after start response by
@@ -866,7 +868,8 @@ bool utils_dfs_is_cac_required(struct wlan_objmgr_pdev *pdev,
  */
 bool
 utils_dfs_is_cac_required_on_dfs_curchan(struct wlan_objmgr_pdev *pdev,
-					 bool *continue_current_cac);
+					 bool *continue_current_cac,
+					 bool is_vap_restart);
 
 /** utils_dfs_is_precac_done() - Check if precac has been done in chosen channel
  * @pdev: Pointer to DFS pdev object.

umac/dfs/dispatcher/src/wlan_dfs_utils_api.c

@@ -305,12 +305,13 @@ bool utils_dfs_is_cac_required(struct wlan_objmgr_pdev *pdev,
 	return dfs_is_cac_required(dfs,
 				   &cur_channel,
 				   &prev_channel,
-				   continue_current_cac);
+				   continue_current_cac, true);
 }
 
 bool
 utils_dfs_is_cac_required_on_dfs_curchan(struct wlan_objmgr_pdev *pdev,
-					 bool *continue_current_cac)
+					 bool *continue_current_cac,
+					 bool is_vap_restart)
 {
 	struct wlan_dfs *dfs;
 
@@ -321,7 +322,8 @@ utils_dfs_is_cac_required_on_dfs_curchan(struct wlan_objmgr_pdev *pdev,
 	return dfs_is_cac_required(dfs,
 				   dfs->dfs_curchan,
 				   dfs->dfs_prevchan,
-				   continue_current_cac);
+				   continue_current_cac,
+				   is_vap_restart);
 }
 
 QDF_STATUS utils_dfs_stacac_stop(struct wlan_objmgr_pdev *pdev)