qcacmn: Modify WMI cmd to point to IPA CLD component

IPA module has been moved to CLD component under the converged
driver model. Point the wmi API's and structures to the newly
defined files.

Change-Id: I96205f7cc18dbea1c05a5f6314490ea6b3dd75fd
CRs-Fixed: 2180176

wmi/inc/wmi_unified_api.h

@@ -63,6 +63,10 @@
 #include "wlan_ocb_public_structs.h"
 #endif
 
+#ifdef IPA_OFFLOAD
+#include "wlan_ipa_public_struct.h"
+#endif
+
 typedef qdf_nbuf_t wmi_buf_t;
 #define wmi_buf_data(_buf) qdf_nbuf_data(_buf)
 
@@ -836,8 +840,10 @@ QDF_STATUS wmi_unified_roam_scan_filter_cmd(void *wmi_hdl,
 QDF_STATUS wmi_unified_set_epno_network_list_cmd(void *wmi_hdl,
 		struct wifi_enhanched_pno_params *req);
 
+#ifdef IPA_OFFLOAD
 QDF_STATUS  wmi_unified_ipa_offload_control_cmd(void *wmi_hdl,
-		struct ipa_offload_control_params *ipa_offload);
+		struct ipa_uc_offload_control_params *ipa_offload);
+#endif
 
 QDF_STATUS wmi_unified_extscan_get_capabilities_cmd(void *wmi_hdl,
 			  struct extscan_capabilities_params *pgetcapab);

wmi/inc/wmi_unified_param.h

@@ -2262,18 +2262,6 @@ enum wmi_extscan_report_events_type {
 	WMI_EXTSCAN_REPORT_EVENTS_NO_BATCH      = 0x04,
 };
 
-/**
- * struct ipa_offload_control_params - ipa offload parameters
- * @offload_type: ipa offload type
- * @vdev_id: vdev id
- * @enable: ipa offload enable/disable
- */
-struct ipa_offload_control_params {
-	uint32_t offload_type;
-	uint32_t vdev_id;
-	uint32_t enable;
-};
-
 /**
  * struct extscan_capabilities_params - ext scan capablities
  * @request_id: request_id

wmi/inc/wmi_unified_priv.h

@@ -515,8 +515,10 @@ QDF_STATUS (*send_pno_start_cmd)(wmi_unified_t wmi_handle,
 QDF_STATUS (*send_nlo_mawc_cmd)(wmi_unified_t wmi_handle,
 		struct nlo_mawc_params *params);
 
+#ifdef IPA_OFFLOAD
 QDF_STATUS (*send_ipa_offload_control_cmd)(wmi_unified_t wmi_handle,
-		struct ipa_offload_control_params *ipa_offload);
+		struct ipa_uc_offload_control_params *ipa_offload);
+#endif
 
 QDF_STATUS (*send_set_ric_req_cmd)(wmi_unified_t wmi_handle, void *msg,
 			uint8_t is_add_ts);

wmi/src/wmi_unified_api.c

@@ -1753,6 +1753,7 @@ QDF_STATUS wmi_unified_roam_scan_filter_cmd(void *wmi_hdl,
 	return QDF_STATUS_E_FAILURE;
 }
 
+#ifdef IPA_OFFLOAD
 /** wmi_unified_ipa_offload_control_cmd() - ipa offload control parameter
  * @wmi_hdl: wmi handle
  * @ipa_offload: ipa offload control parameter
@@ -1761,7 +1762,7 @@ QDF_STATUS wmi_unified_roam_scan_filter_cmd(void *wmi_hdl,
  *          error number otherwise
  */
 QDF_STATUS  wmi_unified_ipa_offload_control_cmd(void *wmi_hdl,
-		struct ipa_offload_control_params *ipa_offload)
+		struct ipa_uc_offload_control_params *ipa_offload)
 {
 	wmi_unified_t wmi_handle = (wmi_unified_t) wmi_hdl;
 
@@ -1771,6 +1772,7 @@ QDF_STATUS  wmi_unified_ipa_offload_control_cmd(void *wmi_hdl,
 
 	return QDF_STATUS_E_FAILURE;
 }
+#endif
 
 /**
  * wmi_unified_extscan_get_capabilities_cmd() - extscan get capabilities

wmi/src/wmi_unified_tlv.c

@@ -7251,7 +7251,7 @@ static QDF_STATUS send_set_epno_network_list_cmd_tlv(wmi_unified_t wmi_handle,
 	return ret;
 }
 
-
+#ifdef IPA_OFFLOAD
 /** send_ipa_offload_control_cmd_tlv() - ipa offload control parameter
  * @wmi_handle: wmi handle
  * @ipa_offload: ipa offload control parameter
@@ -7259,7 +7259,7 @@ static QDF_STATUS send_set_epno_network_list_cmd_tlv(wmi_unified_t wmi_handle,
  * Returns: 0 on success, error number otherwise
  */
 static QDF_STATUS send_ipa_offload_control_cmd_tlv(wmi_unified_t wmi_handle,
-		struct ipa_offload_control_params *ipa_offload)
+		struct ipa_uc_offload_control_params *ipa_offload)
 {
 	wmi_ipa_offload_enable_disable_cmd_fixed_param *cmd;
 	wmi_buf_t wmi_buf;
@@ -7297,6 +7297,7 @@ static QDF_STATUS send_ipa_offload_control_cmd_tlv(wmi_unified_t wmi_handle,
 
 	return QDF_STATUS_SUCCESS;
 }
+#endif
 
 /**
  * send_extscan_get_capabilities_cmd_tlv() - extscan get capabilities
@@ -22464,8 +22465,10 @@ struct wmi_ops tlv_ops =  {
 			send_roam_scan_filter_cmd_tlv,
 	.send_set_epno_network_list_cmd =
 			 send_set_epno_network_list_cmd_tlv,
+#ifdef IPA_OFFLOAD
 	.send_ipa_offload_control_cmd =
 			 send_ipa_offload_control_cmd_tlv,
+#endif
 	.send_extscan_get_capabilities_cmd =
 			 send_extscan_get_capabilities_cmd_tlv,
 	.send_extscan_get_cached_results_cmd =