qcacmn: Consistently use policy_mgr_dual_mac_config

Remove duplicate structs wmi_dual_mac_config and sir_dual_mac_config
and use policy_mgr_dual_mac_config.

Change-Id: I6da6539f519ec46ee274ba3f3ae042e5fd9c25d2
CRs-Fixed: 2191031

umac/cmn_services/policy_mgr/inc/wlan_policy_mgr_public_struct.h

@@ -788,6 +788,9 @@ enum set_hw_mode_status {
 	SET_HW_MODE_STATUS_ECOEX,
 };
 
+typedef void (*dual_mac_cb)(enum set_hw_mode_status status,
+		uint32_t scan_config,
+		uint32_t fw_mode_config);
 /**
  * enum policy_mgr_hw_mode_change - identify the HW mode switching to.
  *
@@ -895,7 +898,7 @@ struct policy_mgr_vdev_mac_map {
 struct policy_mgr_dual_mac_config {
 	uint32_t scan_config;
 	uint32_t fw_mode_config;
-	void *set_dual_mac_cb;
+	dual_mac_cb set_dual_mac_cb;
 };
 
 /**

umac/cmn_services/policy_mgr/src/wlan_policy_mgr_get_set_utils.c

@@ -884,7 +884,7 @@ void policy_mgr_soc_set_dual_mac_cfg_cb(enum set_hw_mode_status status,
 		uint32_t fw_mode_config)
 {
 	policy_mgr_debug("Status:%d for scan_config:%x fw_mode_config:%x",
-			status, scan_config, fw_mode_config);
+			 status, scan_config, fw_mode_config);
 }
 
 void policy_mgr_set_dual_mac_scan_config(struct wlan_objmgr_psoc *psoc,
@@ -930,7 +930,7 @@ void policy_mgr_set_dual_mac_scan_config(struct wlan_objmgr_psoc *psoc,
 		return;
 	}
 
-	cfg.set_dual_mac_cb = (void *)policy_mgr_soc_set_dual_mac_cfg_cb;
+	cfg.set_dual_mac_cb = policy_mgr_soc_set_dual_mac_cfg_cb;
 
 	policy_mgr_debug("scan_config:%x fw_mode_config:%x",
 			cfg.scan_config, cfg.fw_mode_config);
@@ -977,7 +977,7 @@ void policy_mgr_set_dual_mac_fw_mode_config(struct wlan_objmgr_psoc *psoc,
 		return;
 	}
 
-	cfg.set_dual_mac_cb = (void *)policy_mgr_soc_set_dual_mac_cfg_cb;
+	cfg.set_dual_mac_cb = policy_mgr_soc_set_dual_mac_cfg_cb;
 
 	policy_mgr_debug("scan_config:%x fw_mode_config:%x",
 			cfg.scan_config, cfg.fw_mode_config);

wmi/inc/wmi_unified_api.h

@@ -90,6 +90,7 @@ typedef qdf_nbuf_t wmi_buf_t;
 #define PHYERROR_MAX_BUFFER_LENGTH 0x7F000000
 
 struct wmi_soc;
+struct policy_mgr_dual_mac_config;
 /**
  * struct wmi_ops - service callbacks to upper layer
  * @service_ready_cbk: service ready callback
@@ -1069,7 +1070,7 @@ QDF_STATUS wmi_unified_soc_set_hw_mode_cmd(void *wmi_hdl,
 				uint32_t hw_mode_index);
 
 QDF_STATUS wmi_unified_pdev_set_dual_mac_config_cmd(void *wmi_hdl,
-		struct wmi_dual_mac_config *msg);
+		struct policy_mgr_dual_mac_config *msg);
 
 QDF_STATUS wmi_unified_set_led_flashing_cmd(void *wmi_hdl,
 				struct flashing_req_params *flashing);

wmi/inc/wmi_unified_param.h

@@ -3363,18 +3363,6 @@ struct wmi_hw_mode_params {
 	uint8_t agile_dfs_cap;
 };
 
-/**
- * struct wmi_dual_mac_config - Dual MAC configuration
- * @scan_config: Scan configuration
- * @fw_mode_config: FW mode configuration
- * @set_dual_mac_cb: Callback function to be executed on response to the command
- */
-struct wmi_dual_mac_config {
-	uint32_t scan_config;
-	uint32_t fw_mode_config;
-	void *set_dual_mac_cb;
-};
-
 /**
  * struct ssid_hotlist_param - param for SSID Hotlist
  * @ssid: SSID which is being hotlisted

wmi/inc/wmi_unified_priv.h

@@ -761,7 +761,7 @@ QDF_STATUS (*send_pdev_set_hw_mode_cmd)(wmi_unified_t wmi_handle,
 				uint32_t hw_mode_index);
 
 QDF_STATUS (*send_pdev_set_dual_mac_config_cmd)(wmi_unified_t wmi_handle,
-		struct wmi_dual_mac_config *msg);
+		struct policy_mgr_dual_mac_config *msg);
 
 QDF_STATUS (*send_set_led_flashing_cmd)(wmi_unified_t wmi_handle,
 				struct flashing_req_params *flashing);

wmi/src/wmi_unified_api.c

@@ -3025,7 +3025,7 @@ QDF_STATUS wmi_unified_soc_set_hw_mode_cmd(void *wmi_hdl,
  * Return: QDF_STATUS_SUCCESS on success and QDF_STATUS_E_FAILURE for failures.
  */
 QDF_STATUS wmi_unified_pdev_set_dual_mac_config_cmd(void *wmi_hdl,
-		struct wmi_dual_mac_config *msg)
+		struct policy_mgr_dual_mac_config *msg)
 {
 	wmi_unified_t wmi_handle = (wmi_unified_t) wmi_hdl;
 

wmi/src/wmi_unified_tlv.c

@@ -49,6 +49,10 @@
 #include "nan_public_structs.h"
 #endif
 
+#ifdef WLAN_POLICY_MGR_ENABLE
+#include "wlan_policy_mgr_public_struct.h"
+#endif
+
 /* HTC service ids for WMI for multi-radio */
 static const uint32_t multi_svc_ids[] = {WMI_CONTROL_SVC,
 				WMI_CONTROL_SVC_WMAC1,
@@ -13946,6 +13950,7 @@ static QDF_STATUS send_pdev_set_hw_mode_cmd_tlv(wmi_unified_t wmi_handle,
 	return QDF_STATUS_SUCCESS;
 }
 
+#ifdef WLAN_POLICY_MGR_ENABLE
 /**
  * send_pdev_set_dual_mac_config_cmd_tlv() - Set dual mac config to FW
  * @wmi_handle: wmi handle
@@ -13957,7 +13962,7 @@ static QDF_STATUS send_pdev_set_hw_mode_cmd_tlv(wmi_unified_t wmi_handle,
  */
 static
 QDF_STATUS send_pdev_set_dual_mac_config_cmd_tlv(wmi_unified_t wmi_handle,
-		struct wmi_dual_mac_config *msg)
+		struct policy_mgr_dual_mac_config *msg)
 {
 	wmi_pdev_set_mac_config_cmd_fixed_param *cmd;
 	wmi_buf_t buf;
@@ -13992,6 +13997,7 @@ QDF_STATUS send_pdev_set_dual_mac_config_cmd_tlv(wmi_unified_t wmi_handle,
 	}
 	return QDF_STATUS_SUCCESS;
 }
+#endif
 
 #ifdef BIG_ENDIAN_HOST
 /**
@@ -22635,8 +22641,10 @@ struct wmi_ops tlv_ops =  {
 	.send_flush_logs_to_fw_cmd = send_flush_logs_to_fw_cmd_tlv,
 	.send_pdev_set_pcl_cmd = send_pdev_set_pcl_cmd_tlv,
 	.send_pdev_set_hw_mode_cmd = send_pdev_set_hw_mode_cmd_tlv,
+#ifdef WLAN_POLICY_MGR_ENABLE
 	.send_pdev_set_dual_mac_config_cmd =
 		 send_pdev_set_dual_mac_config_cmd_tlv,
+#endif
 	.send_app_type1_params_in_fw_cmd =
 		 send_app_type1_params_in_fw_cmd_tlv,
 	.send_set_ssid_hotlist_cmd = send_set_ssid_hotlist_cmd_tlv,