qcacmn: Adpat common wmi layer with QDF os abstraction

Adapt common wmi layer with converged os abstraction layer.
Remove references to non-converged header files from
wmi layer.

Change-Id: I3671a40604fa1a5f10a5a67106db33f382e0f335
CRs-Fixed: 983619

wmi/inc/wmi_unified_api.h

@@ -40,8 +40,28 @@
 #include "htc_api.h"
 #include "wmi_unified_param.h"
 
-typedef cdf_nbuf_t wmi_buf_t;
-#define wmi_buf_data(_buf) cdf_nbuf_data(_buf)
+typedef qdf_nbuf_t wmi_buf_t;
+#define wmi_buf_data(_buf) qdf_nbuf_data(_buf)
+
+#define WMI_LOGD(args ...) \
+	QDF_TRACE(QDF_MODULE_ID_WMI, QDF_TRACE_LEVEL_DEBUG, ## args)
+#define WMI_LOGI(args ...) \
+	QDF_TRACE(QDF_MODULE_ID_WMI, QDF_TRACE_LEVEL_INFO, ## args)
+#define WMI_LOGW(args ...) \
+	QDF_TRACE(QDF_MODULE_ID_WMI, QDF_TRACE_LEVEL_WARN, ## args)
+#define WMI_LOGE(args ...) \
+	QDF_TRACE(QDF_MODULE_ID_WMI, QDF_TRACE_LEVEL_ERROR, ## args)
+#define WMI_LOGP(args ...) \
+	QDF_TRACE(QDF_MODULE_ID_WMI, QDF_TRACE_LEVEL_FATAL, ## args)
+
+#define WMI_DEBUG_ALWAYS
+
+#ifdef WMI_DEBUG_ALWAYS
+#define WMI_LOGA(args ...) \
+	QDF_TRACE(QDF_MODULE_ID_WMI, QDF_TRACE_LEVEL_FATAL, ## args)
+#else
+#define WMI_LOGA(args ...)
+#endif
 
 /**
  * struct wmi_ops - service callbacks to upper layer
@@ -212,520 +232,520 @@ static inline bool wmi_get_runtime_pm_inprogress(wmi_unified_t wmi_handle)
 
 
 /**
- * WMA Callback to process fw event.
+ * UMAC Callback to process fw event.
  */
 void wmi_process_fw_event(struct wmi_unified *wmi_handle, wmi_buf_t evt_buf);
 uint16_t wmi_get_max_msg_len(wmi_unified_t wmi_handle);
 
 
-CDF_STATUS wmi_unified_vdev_create_send(void *wmi_hdl,
+QDF_STATUS wmi_unified_vdev_create_send(void *wmi_hdl,
 				 uint8_t macaddr[IEEE80211_ADDR_LEN],
 				 struct vdev_create_params *param);
 
-CDF_STATUS wmi_unified_vdev_delete_send(void *wmi_hdl,
+QDF_STATUS wmi_unified_vdev_delete_send(void *wmi_hdl,
 					  uint8_t if_id);
 
-CDF_STATUS wmi_unified_vdev_start_send(void *wmi_hdl,
+QDF_STATUS wmi_unified_vdev_start_send(void *wmi_hdl,
 				uint8_t macaddr[IEEE80211_ADDR_LEN],
 				struct vdev_start_params *param);
 
-CDF_STATUS wmi_unified_vdev_restart_send(void *wmi_hdl,
+QDF_STATUS wmi_unified_vdev_restart_send(void *wmi_hdl,
 				uint8_t macaddr[IEEE80211_ADDR_LEN],
 				struct vdev_start_params *param);
 
-CDF_STATUS wmi_unified_vdev_stop_send(void *wmi_hdl,
+QDF_STATUS wmi_unified_vdev_stop_send(void *wmi_hdl,
 					uint8_t vdev_id);
 
-CDF_STATUS wmi_unified_vdev_up_send(void *wmi_hdl,
+QDF_STATUS wmi_unified_vdev_up_send(void *wmi_hdl,
 			     uint8_t bssid[IEEE80211_ADDR_LEN],
 				 struct vdev_up_params *params);
 
-CDF_STATUS wmi_unified_vdev_down_send(void *wmi_hdl,
+QDF_STATUS wmi_unified_vdev_down_send(void *wmi_hdl,
 				uint8_t vdev_id);
 
-CDF_STATUS wmi_unified_vdev_set_param_send(void *wmi_hdl,
+QDF_STATUS wmi_unified_vdev_set_param_send(void *wmi_hdl,
 				struct vdev_set_params *param);
 
-CDF_STATUS wmi_unified_peer_delete_send(void *wmi_hdl,
+QDF_STATUS wmi_unified_peer_delete_send(void *wmi_hdl,
 				    uint8_t
 				    peer_addr[IEEE80211_ADDR_LEN],
 				    uint8_t vdev_id);
 
-CDF_STATUS wmi_unified_peer_flush_tids_send(void *wmi_hdl,
+QDF_STATUS wmi_unified_peer_flush_tids_send(void *wmi_hdl,
 					 uint8_t peer_addr[IEEE80211_ADDR_LEN],
 					 struct peer_flush_params *param);
 
-CDF_STATUS wmi_set_peer_param_send(void *wmi_hdl,
+QDF_STATUS wmi_set_peer_param_send(void *wmi_hdl,
 				uint8_t peer_addr[IEEE80211_ADDR_LEN],
 				struct peer_set_params *param);
 
-CDF_STATUS wmi_unified_peer_create_send(void *wmi_hdl,
+QDF_STATUS wmi_unified_peer_create_send(void *wmi_hdl,
 					struct peer_create_params *param);
 
-CDF_STATUS wmi_unified_stats_request_send(void *wmi_hdl,
+QDF_STATUS wmi_unified_stats_request_send(void *wmi_hdl,
 				uint8_t macaddr[IEEE80211_ADDR_LEN],
 				struct stats_request_params *param);
 
-CDF_STATUS wmi_unified_green_ap_ps_send(void *wmi_hdl,
+QDF_STATUS wmi_unified_green_ap_ps_send(void *wmi_hdl,
 						uint32_t value, uint8_t mac_id);
 
 
-CDF_STATUS wmi_unified_wow_enable_send(void *wmi_hdl,
+QDF_STATUS wmi_unified_wow_enable_send(void *wmi_hdl,
 				struct wow_cmd_params *param,
 				uint8_t mac_id);
 
-CDF_STATUS wmi_unified_packet_log_enable_send(void *wmi_hdl,
+QDF_STATUS wmi_unified_packet_log_enable_send(void *wmi_hdl,
 				uint8_t macaddr[IEEE80211_ADDR_LEN],
 				struct packet_enable_params *param);
 
 
-CDF_STATUS wmi_unified_suspend_send(void *wmi_hdl,
+QDF_STATUS wmi_unified_suspend_send(void *wmi_hdl,
 				struct suspend_params *param,
 				uint8_t mac_id);
 
-CDF_STATUS wmi_unified_resume_send(void *wmi_hdl,
+QDF_STATUS wmi_unified_resume_send(void *wmi_hdl,
 				uint8_t mac_id);
 
-CDF_STATUS
+QDF_STATUS
 wmi_unified_pdev_param_send(void *wmi_hdl,
 			   struct pdev_params *param,
 				uint8_t mac_id);
 
-CDF_STATUS wmi_unified_beacon_send_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_beacon_send_cmd(void *wmi_hdl,
 				struct beacon_params *param);
 
-CDF_STATUS wmi_unified_peer_assoc_send(void *wmi_hdl,
+QDF_STATUS wmi_unified_peer_assoc_send(void *wmi_hdl,
 				struct peer_assoc_params *param);
 
-CDF_STATUS wmi_unified_sta_ps_cmd_send(void *wmi_hdl,
+QDF_STATUS wmi_unified_sta_ps_cmd_send(void *wmi_hdl,
 				struct sta_ps_params *param);
 
-CDF_STATUS wmi_unified_ap_ps_cmd_send(void *wmi_hdl,
+QDF_STATUS wmi_unified_ap_ps_cmd_send(void *wmi_hdl,
 				uint8_t macaddr[IEEE80211_ADDR_LEN],
 				struct ap_ps_params *param);
 
-CDF_STATUS wmi_unified_scan_start_cmd_send(void *wmi_hdl,
+QDF_STATUS wmi_unified_scan_start_cmd_send(void *wmi_hdl,
 				struct scan_start_params *param);
 
-CDF_STATUS wmi_unified_scan_stop_cmd_send(void *wmi_hdl,
+QDF_STATUS wmi_unified_scan_stop_cmd_send(void *wmi_hdl,
 				struct scan_stop_params *param);
 
-CDF_STATUS wmi_unified_scan_chan_list_cmd_send(void *wmi_hdl,
+QDF_STATUS wmi_unified_scan_chan_list_cmd_send(void *wmi_hdl,
 				struct scan_chan_list_params *param);
 
 
-CDF_STATUS wmi_crash_inject(void *wmi_hdl,
+QDF_STATUS wmi_crash_inject(void *wmi_hdl,
 				struct crash_inject *param);
 
-CDF_STATUS wmi_unified_pdev_utf_cmd_send(void *wmi_hdl,
+QDF_STATUS wmi_unified_pdev_utf_cmd_send(void *wmi_hdl,
 				struct pdev_utf_params *param,
 				uint8_t mac_id);
 
-CDF_STATUS wmi_unified_dbglog_cmd_send(void *wmi_hdl,
+QDF_STATUS wmi_unified_dbglog_cmd_send(void *wmi_hdl,
 				struct dbglog_params *param);
 
-CDF_STATUS wmi_mgmt_unified_cmd_send(void *wmi_hdl,
+QDF_STATUS wmi_mgmt_unified_cmd_send(void *wmi_hdl,
 				struct wmi_mgmt_params *param);
 
-CDF_STATUS wmi_unified_modem_power_state(void *wmi_hdl,
+QDF_STATUS wmi_unified_modem_power_state(void *wmi_hdl,
 		uint32_t param_value);
 
-CDF_STATUS wmi_unified_set_sta_ps_mode(void *wmi_hdl,
+QDF_STATUS wmi_unified_set_sta_ps_mode(void *wmi_hdl,
 			       uint32_t vdev_id, uint8_t val);
-CDF_STATUS
+QDF_STATUS
 wmi_unified_set_sta_uapsd_auto_trig_cmd(void *wmi_hdl,
 				struct sta_uapsd_trig_params *param);
 
-CDF_STATUS wmi_unified_get_temperature(void *wmi_hdl);
+QDF_STATUS wmi_unified_get_temperature(void *wmi_hdl);
 
-CDF_STATUS wmi_unified_set_p2pgo_oppps_req(void *wmi_hdl,
+QDF_STATUS wmi_unified_set_p2pgo_oppps_req(void *wmi_hdl,
 		struct p2p_ps_params *oppps);
 
-CDF_STATUS wmi_unified_set_p2pgo_noa_req_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_set_p2pgo_noa_req_cmd(void *wmi_hdl,
 			struct p2p_ps_params *noa);
 
-CDF_STATUS wmi_unified_set_smps_params(void *wmi_hdl, uint8_t vdev_id,
+QDF_STATUS wmi_unified_set_smps_params(void *wmi_hdl, uint8_t vdev_id,
 			       int value);
 
-CDF_STATUS wmi_unified_set_mimops(void *wmi_hdl, uint8_t vdev_id, int value);
+QDF_STATUS wmi_unified_set_mimops(void *wmi_hdl, uint8_t vdev_id, int value);
 
-CDF_STATUS wmi_unified_ocb_set_utc_time(void *wmi_hdl,
+QDF_STATUS wmi_unified_ocb_set_utc_time(void *wmi_hdl,
 				struct ocb_utc_param *utc);
 
-CDF_STATUS wmi_unified_ocb_start_timing_advert(void *wmi_hdl,
+QDF_STATUS wmi_unified_ocb_start_timing_advert(void *wmi_hdl,
 	struct ocb_timing_advert_param *timing_advert);
 
-CDF_STATUS wmi_unified_ocb_stop_timing_advert(void *wmi_hdl,
+QDF_STATUS wmi_unified_ocb_stop_timing_advert(void *wmi_hdl,
 	struct ocb_timing_advert_param *timing_advert);
 
-CDF_STATUS wmi_unified_ocb_set_config(void *wmi_hdl,
+QDF_STATUS wmi_unified_ocb_set_config(void *wmi_hdl,
 		   struct ocb_config_param *config, uint32_t *ch_mhz);
 
-CDF_STATUS wmi_unified_ocb_get_tsf_timer(void *wmi_hdl,
+QDF_STATUS wmi_unified_ocb_get_tsf_timer(void *wmi_hdl,
 			  uint8_t vdev_id);
 
-CDF_STATUS wmi_unified_lro_config_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_lro_config_cmd(void *wmi_hdl,
 	 struct wmi_lro_config_cmd_t *wmi_lro_cmd);
 
-CDF_STATUS wmi_unified_set_thermal_mgmt_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_set_thermal_mgmt_cmd(void *wmi_hdl,
 				struct thermal_cmd_params *thermal_info);
 
-CDF_STATUS wmi_unified_set_mcc_channel_time_quota_cmd
+QDF_STATUS wmi_unified_set_mcc_channel_time_quota_cmd
 	(void *wmi_hdl,
 	uint32_t adapter_1_chan_freq,
 	uint32_t adapter_1_quota, uint32_t adapter_2_chan_freq);
 
-CDF_STATUS wmi_unified_set_mcc_channel_time_latency_cmd
+QDF_STATUS wmi_unified_set_mcc_channel_time_latency_cmd
 	(void *wmi_hdl,
 	uint32_t mcc_channel_freq, uint32_t mcc_channel_time_latency);
 
-CDF_STATUS wmi_unified_set_enable_disable_mcc_adaptive_scheduler_cmd(
+QDF_STATUS wmi_unified_set_enable_disable_mcc_adaptive_scheduler_cmd(
 		   void *wmi_hdl, uint32_t mcc_adaptive_scheduler);
 
-CDF_STATUS wmi_unified_bcn_buf_ll_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_bcn_buf_ll_cmd(void *wmi_hdl,
 			wmi_bcn_send_from_host_cmd_fixed_param *param);
 
-CDF_STATUS wmi_unified_set_sta_sa_query_param_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_set_sta_sa_query_param_cmd(void *wmi_hdl,
 				       uint8_t vdev_id, uint32_t max_retries,
 					   uint32_t retry_interval);
 
 
-CDF_STATUS wmi_unified_set_sta_keep_alive_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_set_sta_keep_alive_cmd(void *wmi_hdl,
 				struct sta_params *params);
 
-CDF_STATUS wmi_unified_vdev_set_gtx_cfg_cmd(void *wmi_hdl, uint32_t if_id,
+QDF_STATUS wmi_unified_vdev_set_gtx_cfg_cmd(void *wmi_hdl, uint32_t if_id,
 				  struct wmi_gtx_config *gtx_info);
 
 
-CDF_STATUS wmi_unified_process_update_edca_param(void *wmi_hdl,
+QDF_STATUS wmi_unified_process_update_edca_param(void *wmi_hdl,
 		     uint8_t vdev_id,
 		     wmi_wmm_vparams gwmm_param[WMI_MAX_NUM_AC]);
 
 
-CDF_STATUS wmi_unified_probe_rsp_tmpl_send_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_probe_rsp_tmpl_send_cmd(void *wmi_hdl,
 		   uint8_t vdev_id,
 		   struct wmi_probe_resp_params *probe_rsp_info,
 		   uint8_t *frm);
 
-CDF_STATUS wmi_unified_p2p_go_set_beacon_ie_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_p2p_go_set_beacon_ie_cmd(void *wmi_hdl,
 				    A_UINT32 vdev_id, uint8_t *p2p_ie);
 
 
-CDF_STATUS wmi_unified_set_gateway_params_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_set_gateway_params_cmd(void *wmi_hdl,
 					struct gateway_update_req_param *req);
 
-CDF_STATUS wmi_unified_set_rssi_monitoring_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_set_rssi_monitoring_cmd(void *wmi_hdl,
 					struct rssi_monitor_param *req);
 
-CDF_STATUS wmi_unified_scan_probe_setoui_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_scan_probe_setoui_cmd(void *wmi_hdl,
 			  struct scan_mac_oui *psetoui);
 
-CDF_STATUS wmi_unified_reset_passpoint_network_list_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_reset_passpoint_network_list_cmd(void *wmi_hdl,
 					struct wifi_passpoint_req_param *req);
 
-CDF_STATUS wmi_unified_set_passpoint_network_list_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_set_passpoint_network_list_cmd(void *wmi_hdl,
 					struct wifi_passpoint_req_param *req);
 
-CDF_STATUS wmi_unified_set_epno_network_list_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_set_epno_network_list_cmd(void *wmi_hdl,
 		struct wifi_enhanched_pno_params *req);
 
-CDF_STATUS  wmi_unified_ipa_offload_control_cmd(void *wmi_hdl,
+QDF_STATUS  wmi_unified_ipa_offload_control_cmd(void *wmi_hdl,
 		struct ipa_offload_control_params *ipa_offload);
 
-CDF_STATUS wmi_unified_extscan_get_capabilities_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_extscan_get_capabilities_cmd(void *wmi_hdl,
 			  struct extscan_capabilities_params *pgetcapab);
 
-CDF_STATUS wmi_unified_extscan_get_cached_results_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_extscan_get_cached_results_cmd(void *wmi_hdl,
 			  struct extscan_cached_result_params *pcached_results);
 
 
-CDF_STATUS wmi_unified_extscan_stop_change_monitor_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_extscan_stop_change_monitor_cmd(void *wmi_hdl,
 			  struct extscan_capabilities_reset_params *reset_req);
 
 
-CDF_STATUS wmi_unified_extscan_start_change_monitor_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_extscan_start_change_monitor_cmd(void *wmi_hdl,
 				   struct extscan_set_sig_changereq_params *
 					   psigchange);
 
-CDF_STATUS wmi_unified_extscan_stop_hotlist_monitor_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_extscan_stop_hotlist_monitor_cmd(void *wmi_hdl,
 		  struct extscan_bssid_hotlist_reset_params *photlist_reset);
 
-CDF_STATUS wmi_unified_stop_extscan_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_stop_extscan_cmd(void *wmi_hdl,
 			  struct extscan_stop_req_params *pstopcmd);
 
-CDF_STATUS wmi_unified_start_extscan_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_start_extscan_cmd(void *wmi_hdl,
 			  struct wifi_scan_cmd_req_params *pstart);
 
-CDF_STATUS wmi_unified_plm_stop_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_plm_stop_cmd(void *wmi_hdl,
 			  const struct plm_req_params *plm);
 
-CDF_STATUS wmi_unified_plm_start_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_plm_start_cmd(void *wmi_hdl,
 			  const struct plm_req_params *plm,
 			  uint32_t *gchannel_list);
 
-CDF_STATUS wmi_unified_pno_stop_cmd(void *wmi_hdl, uint8_t vdev_id);
+QDF_STATUS wmi_unified_pno_stop_cmd(void *wmi_hdl, uint8_t vdev_id);
 
-CDF_STATUS wmi_unified_pno_start_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_pno_start_cmd(void *wmi_hdl,
 		   struct pno_scan_req_params *pno,
 		   uint32_t *gchannel_freq_list);
 
-CDF_STATUS wmi_unified_set_ric_req_cmd(void *wmi_hdl, void *msg,
+QDF_STATUS wmi_unified_set_ric_req_cmd(void *wmi_hdl, void *msg,
 			uint8_t is_add_ts);
 
-CDF_STATUS wmi_unified_process_ll_stats_clear_cmd
+QDF_STATUS wmi_unified_process_ll_stats_clear_cmd
 	(void *wmi_hdl, const struct ll_stats_clear_params *clear_req,
 	 uint8_t addr[IEEE80211_ADDR_LEN]);
 
-CDF_STATUS wmi_unified_process_ll_stats_set_cmd
+QDF_STATUS wmi_unified_process_ll_stats_set_cmd
 	(void *wmi_hdl, const struct ll_stats_set_params *set_req);
 
-CDF_STATUS wmi_unified_process_ll_stats_get_cmd
+QDF_STATUS wmi_unified_process_ll_stats_get_cmd
 	(void *wmi_hdl, const struct ll_stats_get_params  *get_req,
 		 uint8_t addr[IEEE80211_ADDR_LEN]);
 
-CDF_STATUS wmi_unified_get_stats_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_get_stats_cmd(void *wmi_hdl,
 		       struct pe_stats_req  *get_stats_param,
 			   uint8_t addr[IEEE80211_ADDR_LEN]);
 
-CDF_STATUS wmi_unified_snr_request_cmd(void *wmi_hdl);
+QDF_STATUS wmi_unified_snr_request_cmd(void *wmi_hdl);
 
-CDF_STATUS wmi_unified_snr_cmd(void *wmi_hdl, uint8_t vdev_id);
+QDF_STATUS wmi_unified_snr_cmd(void *wmi_hdl, uint8_t vdev_id);
 
-CDF_STATUS wmi_unified_link_status_req_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_link_status_req_cmd(void *wmi_hdl,
 				 struct link_status_params *link_status);
 
-CDF_STATUS wmi_unified_lphb_config_hbenable_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_lphb_config_hbenable_cmd(void *wmi_hdl,
 				wmi_hb_set_enable_cmd_fixed_param *params);
 
-CDF_STATUS wmi_unified_lphb_config_tcp_params_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_lphb_config_tcp_params_cmd(void *wmi_hdl,
 				    wmi_hb_set_tcp_params_cmd_fixed_param *lphb_conf_req);
 
-CDF_STATUS wmi_unified_lphb_config_tcp_pkt_filter_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_lphb_config_tcp_pkt_filter_cmd(void *wmi_hdl,
 					wmi_hb_set_tcp_pkt_filter_cmd_fixed_param *g_hb_tcp_filter_fp);
 
-CDF_STATUS wmi_unified_lphb_config_udp_params_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_lphb_config_udp_params_cmd(void *wmi_hdl,
 				    wmi_hb_set_udp_params_cmd_fixed_param *lphb_conf_req);
 
-CDF_STATUS wmi_unified_lphb_config_udp_pkt_filter_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_lphb_config_udp_pkt_filter_cmd(void *wmi_hdl,
 					wmi_hb_set_udp_pkt_filter_cmd_fixed_param *lphb_conf_req);
 
-CDF_STATUS wmi_unified_process_dhcp_ind(void *wmi_hdl,
+QDF_STATUS wmi_unified_process_dhcp_ind(void *wmi_hdl,
 				wmi_peer_set_param_cmd_fixed_param *ta_dhcp_ind);
 
-CDF_STATUS wmi_unified_get_link_speed_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_get_link_speed_cmd(void *wmi_hdl,
 			wmi_mac_addr peer_macaddr);
 
-CDF_STATUS wmi_unified_egap_conf_params_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_egap_conf_params_cmd(void *wmi_hdl,
 				     wmi_ap_ps_egap_param_cmd_fixed_param *egap_params);
 
-CDF_STATUS wmi_unified_fw_profiling_data_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_fw_profiling_data_cmd(void *wmi_hdl,
 			uint32_t cmd, uint32_t value1, uint32_t value2);
 
-CDF_STATUS wmi_unified_wow_sta_ra_filter_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_wow_sta_ra_filter_cmd(void *wmi_hdl,
 			  uint8_t vdev_id, uint8_t default_pattern,
 			  uint16_t rate_limit_interval);
 
-CDF_STATUS wmi_unified_nat_keepalive_en_cmd(void *wmi_hdl, uint8_t vdev_id);
+QDF_STATUS wmi_unified_nat_keepalive_en_cmd(void *wmi_hdl, uint8_t vdev_id);
 
-CDF_STATUS wmi_unified_csa_offload_enable(void *wmi_hdl, uint8_t vdev_id);
+QDF_STATUS wmi_unified_csa_offload_enable(void *wmi_hdl, uint8_t vdev_id);
 
-CDF_STATUS wmi_unified_start_oem_data_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_start_oem_data_cmd(void *wmi_hdl,
 			  uint8_t data_len,
 			  uint8_t *data);
 
-CDF_STATUS wmi_unified_dfs_phyerr_filter_offload_en_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_dfs_phyerr_filter_offload_en_cmd(void *wmi_hdl,
 			bool dfs_phyerr_filter_offload);
 
-CDF_STATUS wmi_unified_pktlog_wmi_send_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_pktlog_wmi_send_cmd(void *wmi_hdl,
 				   WMI_PKTLOG_EVENT pktlog_event,
 				   WMI_CMD_ID cmd_id);
 
-CDF_STATUS wmi_unified_add_wow_wakeup_event_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_add_wow_wakeup_event_cmd(void *wmi_hdl,
 					uint32_t vdev_id,
 					uint32_t bitmap,
 					bool enable);
 
-CDF_STATUS wmi_unified_wow_patterns_to_fw_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_wow_patterns_to_fw_cmd(void *wmi_hdl,
 				uint8_t vdev_id, uint8_t ptrn_id,
 				const uint8_t *ptrn, uint8_t ptrn_len,
 				uint8_t ptrn_offset, const uint8_t *mask,
 				uint8_t mask_len, bool user,
 				uint8_t default_patterns);
 
-CDF_STATUS wmi_unified_wow_delete_pattern_cmd(void *wmi_hdl, uint8_t ptrn_id,
+QDF_STATUS wmi_unified_wow_delete_pattern_cmd(void *wmi_hdl, uint8_t ptrn_id,
 					uint8_t vdev_id);
 
-CDF_STATUS wmi_unified_host_wakeup_ind_to_fw_cmd(void *wmi_hdl);
-CDF_STATUS wmi_unified_del_ts_cmd(void *wmi_hdl, uint8_t vdev_id,
+QDF_STATUS wmi_unified_host_wakeup_ind_to_fw_cmd(void *wmi_hdl);
+QDF_STATUS wmi_unified_del_ts_cmd(void *wmi_hdl, uint8_t vdev_id,
 				uint8_t ac);
 
-CDF_STATUS wmi_unified_aggr_qos_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_aggr_qos_cmd(void *wmi_hdl,
 		      struct aggr_add_ts_param *aggr_qos_rsp_msg);
 
-CDF_STATUS wmi_unified_add_ts_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_add_ts_cmd(void *wmi_hdl,
 		 struct add_ts_param *msg);
 
-CDF_STATUS wmi_unified_enable_disable_packet_filter_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_enable_disable_packet_filter_cmd(void *wmi_hdl,
 					uint8_t vdev_id, bool enable);
 
-CDF_STATUS wmi_unified_config_packet_filter_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_config_packet_filter_cmd(void *wmi_hdl,
 		uint8_t vdev_id, struct rcv_pkt_filter_config *rcv_filter_param,
 		uint8_t filter_id, bool enable);
 
-CDF_STATUS wmi_unified_add_clear_mcbc_filter_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_add_clear_mcbc_filter_cmd(void *wmi_hdl,
 				     uint8_t vdev_id,
-				     struct cdf_mac_addr multicast_addr,
+				     struct qdf_mac_addr multicast_addr,
 				     bool clearList);
 
-CDF_STATUS wmi_unified_send_gtk_offload_cmd(void *wmi_hdl, uint8_t vdev_id,
+QDF_STATUS wmi_unified_send_gtk_offload_cmd(void *wmi_hdl, uint8_t vdev_id,
 					   struct gtk_offload_params *params,
 					   bool enable_offload,
 					   uint32_t gtk_offload_opcode);
 
-CDF_STATUS wmi_unified_process_gtk_offload_getinfo_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_process_gtk_offload_getinfo_cmd(void *wmi_hdl,
 				uint8_t vdev_id,
 				uint64_t offload_req_opcode);
 
-CDF_STATUS wmi_unified_process_add_periodic_tx_ptrn_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_process_add_periodic_tx_ptrn_cmd(void *wmi_hdl,
 						struct periodic_tx_pattern  *
 						pAddPeriodicTxPtrnParams,
 						uint8_t vdev_id);
 
-CDF_STATUS wmi_unified_process_del_periodic_tx_ptrn_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_process_del_periodic_tx_ptrn_cmd(void *wmi_hdl,
 						uint8_t vdev_id,
 						uint8_t pattern_id);
 
-CDF_STATUS wmi_unified_stats_ext_req_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_stats_ext_req_cmd(void *wmi_hdl,
 			struct stats_ext_params *preq);
 
-CDF_STATUS wmi_unified_enable_ext_wow_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_enable_ext_wow_cmd(void *wmi_hdl,
 			struct ext_wow_params *params);
 
-CDF_STATUS wmi_unified_set_app_type2_params_in_fw_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_set_app_type2_params_in_fw_cmd(void *wmi_hdl,
 					  struct app_type2_params *appType2Params);
 
-CDF_STATUS wmi_unified_set_auto_shutdown_timer_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_set_auto_shutdown_timer_cmd(void *wmi_hdl,
 						  uint32_t timer_val);
 
-CDF_STATUS wmi_unified_nan_req_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_nan_req_cmd(void *wmi_hdl,
 			struct nan_req_params *nan_req);
 
-CDF_STATUS wmi_unified_process_dhcpserver_offload_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_process_dhcpserver_offload_cmd(void *wmi_hdl,
 				struct dhcp_offload_info_params *pDhcpSrvOffloadInfo);
 
-CDF_STATUS wmi_unified_process_ch_avoid_update_cmd(void *wmi_hdl);
+QDF_STATUS wmi_unified_process_ch_avoid_update_cmd(void *wmi_hdl);
 
-CDF_STATUS wmi_unified_send_regdomain_info_to_fw_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_send_regdomain_info_to_fw_cmd(void *wmi_hdl,
 				   uint32_t reg_dmn, uint16_t regdmn2G,
 				   uint16_t regdmn5G, int8_t ctl2G,
 				   int8_t ctl5G);
 
-CDF_STATUS wmi_unified_set_tdls_offchan_mode_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_set_tdls_offchan_mode_cmd(void *wmi_hdl,
 			      struct tdls_channel_switch_params *chan_switch_params);
 
-CDF_STATUS wmi_unified_update_fw_tdls_state_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_update_fw_tdls_state_cmd(void *wmi_hdl,
 					 void *tdls_param, uint8_t tdls_state);
 
-CDF_STATUS wmi_unified_update_tdls_peer_state_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_update_tdls_peer_state_cmd(void *wmi_hdl,
 			       struct tdls_peer_state_params *peerStateParams,
 				   uint32_t *ch_mhz);
 
-CDF_STATUS wmi_unified_process_fw_mem_dump_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_process_fw_mem_dump_cmd(void *wmi_hdl,
 					struct fw_dump_req_param *mem_dump_req);
 
-CDF_STATUS wmi_unified_process_set_ie_info_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_process_set_ie_info_cmd(void *wmi_hdl,
 				   struct vdev_ie_info_param *ie_info);
 
-CDF_STATUS wmi_unified_ocb_set_utc_time_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_ocb_set_utc_time_cmd(void *wmi_hdl,
 			  struct ocb_utc_param *utc);
 
-CDF_STATUS wmi_unified_dcc_get_stats_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_dcc_get_stats_cmd(void *wmi_hdl,
 		     struct dcc_get_stats_param *get_stats_param);
 
-CDF_STATUS wmi_unified_dcc_clear_stats(void *wmi_hdl,
+QDF_STATUS wmi_unified_dcc_clear_stats(void *wmi_hdl,
 				uint32_t vdev_id, uint32_t dcc_stats_bitmap);
 
-CDF_STATUS wmi_unified_dcc_update_ndl(void *wmi_hdl,
+QDF_STATUS wmi_unified_dcc_update_ndl(void *wmi_hdl,
 		       struct dcc_update_ndl_param *update_ndl_param);
 
-CDF_STATUS wmi_unified_save_fw_version_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_save_fw_version_cmd(void *wmi_hdl,
 		void *evt_buf);
 
-CDF_STATUS wmi_unified_send_init_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_send_init_cmd(void *wmi_hdl,
 		wmi_resource_config *res_cfg,
 		uint8_t num_mem_chunks, struct wmi_host_mem_chunk *mem_chunk,
 		bool action);
 
-CDF_STATUS wmi_unified_send_saved_init_cmd(void *wmi_hdl);
+QDF_STATUS wmi_unified_send_saved_init_cmd(void *wmi_hdl);
 
-CDF_STATUS wmi_unified_set_base_macaddr_indicate_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_set_base_macaddr_indicate_cmd(void *wmi_hdl,
 					 uint8_t *custom_addr);
 
-CDF_STATUS wmi_unified_log_supported_evt_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_log_supported_evt_cmd(void *wmi_hdl,
 		uint8_t *event,
 		uint32_t len);
 
-CDF_STATUS wmi_unified_enable_specific_fw_logs_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_enable_specific_fw_logs_cmd(void *wmi_hdl,
 		struct wmi_wifi_start_log *start_log);
 
-CDF_STATUS wmi_unified_flush_logs_to_fw_cmd(void *wmi_hdl);
+QDF_STATUS wmi_unified_flush_logs_to_fw_cmd(void *wmi_hdl);
 
-CDF_STATUS wmi_unified_soc_set_pcl_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_soc_set_pcl_cmd(void *wmi_hdl,
 				struct wmi_pcl_list *msg);
 
-CDF_STATUS wmi_unified_soc_set_hw_mode_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_soc_set_hw_mode_cmd(void *wmi_hdl,
 				uint32_t hw_mode_index);
 
-CDF_STATUS wmi_unified_soc_set_dual_mac_config_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_soc_set_dual_mac_config_cmd(void *wmi_hdl,
 		struct wmi_dual_mac_config *msg);
 
-CDF_STATUS wmi_unified_enable_arp_ns_offload_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_enable_arp_ns_offload_cmd(void *wmi_hdl,
 			   struct host_offload_req_param *param, bool arp_only,
 			   uint8_t vdev_id);
 
-CDF_STATUS wmi_unified_set_led_flashing_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_set_led_flashing_cmd(void *wmi_hdl,
 				struct flashing_req_params *flashing);
 
-CDF_STATUS wmi_unified_app_type1_params_in_fw_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_app_type1_params_in_fw_cmd(void *wmi_hdl,
 				   struct app_type1_params *app_type1_params);
 
-CDF_STATUS wmi_unified_set_ssid_hotlist_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_set_ssid_hotlist_cmd(void *wmi_hdl,
 		     struct ssid_hotlist_request_params *request);
 
-CDF_STATUS wmi_unified_roam_synch_complete_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_roam_synch_complete_cmd(void *wmi_hdl,
 		 uint8_t vdev_id);
 
-CDF_STATUS wmi_unified_unit_test_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_unit_test_cmd(void *wmi_hdl,
 			       struct wmi_unit_test_cmd *wmi_utest);
 
-CDF_STATUS wmi_unified_roam_invoke_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_roam_invoke_cmd(void *wmi_hdl,
 		struct wmi_roam_invoke_cmd *roaminvoke,
 		uint32_t ch_hz);
 
-CDF_STATUS wmi_unified_roam_scan_offload_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_roam_scan_offload_cmd(void *wmi_hdl,
 					 uint32_t command, uint32_t vdev_id);
 
-CDF_STATUS wmi_unified_send_roam_scan_offload_ap_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_send_roam_scan_offload_ap_cmd(void *wmi_hdl,
 					    wmi_ap_profile *ap_profile_p,
 					    uint32_t vdev_id);
 
-CDF_STATUS wmi_unified_roam_scan_offload_scan_period(void *wmi_hdl,
+QDF_STATUS wmi_unified_roam_scan_offload_scan_period(void *wmi_hdl,
 					     uint32_t scan_period,
 					     uint32_t scan_age,
 					     uint32_t vdev_id);
 
-CDF_STATUS wmi_unified_roam_scan_offload_chan_list_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_roam_scan_offload_chan_list_cmd(void *wmi_hdl,
 				   uint8_t chan_count,
 				   uint8_t *chan_list,
 				   uint8_t list_type, uint32_t vdev_id);
 
-CDF_STATUS wmi_unified_roam_scan_offload_rssi_change_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_roam_scan_offload_rssi_change_cmd(void *wmi_hdl,
 			  uint32_t vdev_id,
 			  int32_t rssi_change_thresh,
 			  uint32_t bcn_rssi_weight,
 			  uint32_t hirssi_delay_btw_scans);
 
-CDF_STATUS wmi_unified_get_buf_extscan_hotlist_cmd(void *wmi_hdl,
+QDF_STATUS wmi_unified_get_buf_extscan_hotlist_cmd(void *wmi_hdl,
 				   struct ext_scan_setbssi_hotlist_params *
 				   photlist, int *buf_len);
 #endif /* _WMI_UNIFIED_API_H_ */

wmi/inc/wmi_unified_non_tlv.h

@@ -31,99 +31,99 @@
 
 #include "ol_defines.h" /* Fix Me: wmi_unified_t structure definition */
 
-CDF_STATUS send_vdev_create_cmd_non_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_vdev_create_cmd_non_tlv(wmi_unified_t wmi_handle,
 				 uint8_t macaddr[IEEE80211_ADDR_LEN],
 				 struct vdev_create_params *param);
 
-CDF_STATUS send_vdev_delete_cmd_non_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_vdev_delete_cmd_non_tlv(wmi_unified_t wmi_handle,
 					  uint8_t if_id);
 
-CDF_STATUS send_vdev_stop_cmd_non_tlv(wmi_unified_t wmi,
+QDF_STATUS send_vdev_stop_cmd_non_tlv(wmi_unified_t wmi,
 					uint8_t vdev_id);
 
-CDF_STATUS send_vdev_down_cmd_non_tlv(wmi_unified_t wmi,
+QDF_STATUS send_vdev_down_cmd_non_tlv(wmi_unified_t wmi,
 			uint8_t vdev_id);
 
-CDF_STATUS send_peer_flush_tids_cmd_non_tlv(wmi_unified_t wmi,
+QDF_STATUS send_peer_flush_tids_cmd_non_tlv(wmi_unified_t wmi,
 					 uint8_t peer_addr[IEEE80211_ADDR_LEN],
 					 struct peer_flush_params *param);
 
-CDF_STATUS send_peer_delete_cmd_non_tlv(wmi_unified_t wmi,
+QDF_STATUS send_peer_delete_cmd_non_tlv(wmi_unified_t wmi,
 				    uint8_t peer_addr[IEEE80211_ADDR_LEN],
 				    uint8_t vdev_id);
 
-CDF_STATUS send_peer_param_cmd_non_tlv(wmi_unified_t wmi,
+QDF_STATUS send_peer_param_cmd_non_tlv(wmi_unified_t wmi,
 				uint8_t peer_addr[IEEE80211_ADDR_LEN],
 				struct peer_set_params *param);
 
-CDF_STATUS send_vdev_up_cmd_non_tlv(wmi_unified_t wmi,
+QDF_STATUS send_vdev_up_cmd_non_tlv(wmi_unified_t wmi,
 			     uint8_t bssid[IEEE80211_ADDR_LEN],
 				 struct vdev_up_params *params);
 
-CDF_STATUS send_peer_create_cmd_non_tlv(wmi_unified_t wmi,
+QDF_STATUS send_peer_create_cmd_non_tlv(wmi_unified_t wmi,
 					struct peer_create_params *param);
 
-CDF_STATUS send_green_ap_ps_cmd_non_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_green_ap_ps_cmd_non_tlv(wmi_unified_t wmi_handle,
 						uint32_t value, uint8_t mac_id);
 
-CDF_STATUS
+QDF_STATUS
 send_pdev_utf_cmd_non_tlv(wmi_unified_t wmi_handle,
 				struct pdev_utf_params *param,
 				uint8_t mac_id);
 
-CDF_STATUS
+QDF_STATUS
 send_pdev_param_cmd_non_tlv(wmi_unified_t wmi_handle,
 			   struct pdev_params *param,
 				uint8_t mac_id);
 
-CDF_STATUS send_suspend_cmd_non_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_suspend_cmd_non_tlv(wmi_unified_t wmi_handle,
 				struct suspend_params *param,
 				uint8_t mac_id);
 
-CDF_STATUS send_resume_cmd_non_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_resume_cmd_non_tlv(wmi_unified_t wmi_handle,
 				uint8_t mac_id);
 
-CDF_STATUS send_wow_enable_cmd_non_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_wow_enable_cmd_non_tlv(wmi_unified_t wmi_handle,
 				struct wow_cmd_params *param,
 				uint8_t mac_id);
 
-CDF_STATUS send_set_ap_ps_param_cmd_non_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_set_ap_ps_param_cmd_non_tlv(wmi_unified_t wmi_handle,
 					   uint8_t *peer_addr,
 					   struct ap_ps_params *param);
 
-CDF_STATUS send_set_sta_ps_param_cmd_non_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_set_sta_ps_param_cmd_non_tlv(wmi_unified_t wmi_handle,
 					   struct sta_ps_params *param);
 
-CDF_STATUS send_crash_inject_cmd_non_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_crash_inject_cmd_non_tlv(wmi_unified_t wmi_handle,
 			 struct crash_inject *param);
 
-CDF_STATUS
+QDF_STATUS
 send_dbglog_cmd_non_tlv(wmi_unified_t wmi_handle,
 				struct dbglog_params *dbglog_param);
 
-CDF_STATUS send_vdev_set_param_cmd_non_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_vdev_set_param_cmd_non_tlv(wmi_unified_t wmi_handle,
 				struct vdev_set_params *param);
 
-CDF_STATUS send_stats_request_cmd_non_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_stats_request_cmd_non_tlv(wmi_unified_t wmi_handle,
 				uint8_t macaddr[IEEE80211_ADDR_LEN],
 				struct stats_request_params *param);
 
-CDF_STATUS send_packet_log_enable_cmd_non_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_packet_log_enable_cmd_non_tlv(wmi_unified_t wmi_handle,
 				uint8_t macaddr[IEEE80211_ADDR_LEN],
 				struct packet_enable_params *param);
 
-CDF_STATUS send_beacon_send_cmd_non_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_beacon_send_cmd_non_tlv(wmi_unified_t wmi_handle,
 				struct beacon_params *param);
 
-CDF_STATUS send_peer_assoc_cmd_non_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_peer_assoc_cmd_non_tlv(wmi_unified_t wmi_handle,
 				struct peer_assoc_params *param);
 
-CDF_STATUS send_scan_start_cmd_non_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_scan_start_cmd_non_tlv(wmi_unified_t wmi_handle,
 				struct scan_start_params *param);
 
-CDF_STATUS send_scan_stop_cmd_non_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_scan_stop_cmd_non_tlv(wmi_unified_t wmi_handle,
 				struct scan_stop_params *param);
 
-CDF_STATUS send_scan_chan_list_cmd_non_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_scan_chan_list_cmd_non_tlv(wmi_unified_t wmi_handle,
 				struct scan_chan_list_params *param);
 

wmi/inc/wmi_unified_param.h

@@ -71,6 +71,17 @@
 #endif /* WLAN_NS_OFFLOAD */
 #define WMI_EXTSCAN_MAX_HOTLIST_SSIDS                    8
 #define WMI_ROAM_MAX_CHANNELS                            80
+#ifdef FEATURE_WLAN_EXTSCAN
+#define WMI_MAX_EXTSCAN_MSG_SIZE        1536
+#define WMI_EXTSCAN_REST_TIME           100
+#define WMI_EXTSCAN_MAX_SCAN_TIME       50000
+#define WMI_EXTSCAN_BURST_DURATION      150
+#endif
+#define WMI_SCAN_NPROBES_DEFAULT            (2)
+#define WMI_SEC_TO_MSEC(sec)         (sec * 1000)  /* sec to msec */
+#define WMI_MSEC_TO_USEC(msec)       (msec * 1000) /* msec to usec */
+#define WMI_NLO_FREQ_THRESH          1000       /* in MHz */
+
 /**
  * struct vdev_create_params - vdev create cmd parameter
  * @if_id: interface id
@@ -391,7 +402,7 @@ struct ap_ps_params {
 struct mac_ssid {
 	uint8_t length;
 	uint8_t mac_ssid[WMI_MAC_MAX_SSID_LENGTH];
-} cdf_packed;
+} qdf_packed;
 
 /**
  * struct scan_start_params - start scan cmd parameter
@@ -555,7 +566,7 @@ struct wmi_mgmt_params {
 	uint16_t chanfreq;
 	void *pdata;
 	struct wmi_desc_t *wmi_desc;
-	void *cdf_ctx;
+	void *qdf_ctx;
 };
 
 /**
@@ -697,7 +708,7 @@ struct wmi_ocb_qos_params {
 struct ocb_config_channel {
 	uint32_t chan_freq;
 	uint32_t bandwidth;
-	struct cdf_mac_addr mac_address;
+	struct qdf_mac_addr mac_address;
 	struct wmi_ocb_qos_params qos_params[WMI_MAX_NUM_AC];
 	uint32_t max_pwr;
 	uint32_t min_pwr;
@@ -841,9 +852,9 @@ struct gateway_update_req_param {
 	uint32_t     timeout;
 	uint32_t     ipv4_addr_type;
 	uint32_t     ipv6_addr_type;
-	struct cdf_mac_addr  gw_mac_addr;
-	uint8_t      ipv4_addr[CDF_IPV4_ADDR_SIZE];
-	uint8_t      ipv6_addr[CDF_IPV6_ADDR_SIZE];
+	struct qdf_mac_addr  gw_mac_addr;
+	uint8_t      ipv4_addr[QDF_IPV4_ADDR_SIZE];
+	uint8_t      ipv6_addr[QDF_IPV6_ADDR_SIZE];
 };
 
 /**
@@ -1010,7 +1021,7 @@ struct extscan_stop_req_params {
  * @high: high threshold
  */
 struct ap_threshold_params {
-	struct cdf_mac_addr bssid;
+	struct qdf_mac_addr bssid;
 	int32_t low;
 	int32_t high;
 };
@@ -1294,7 +1305,7 @@ struct plm_req_params {
 	/* no of times the STA should cycle through PLM ch list */
 	uint8_t burst_len;
 	int8_t desired_tx_pwr;
-	struct cdf_mac_addr mac_addr;
+	struct qdf_mac_addr mac_addr;
 	/* no of channels */
 	uint8_t plm_num_ch;
 	/* channel numbers */
@@ -1345,7 +1356,7 @@ struct mac_ts_info_tfc {
 	uint16_t userPrio:3;
 	uint16_t ackPolicy:2;
 #endif
-} cdf_packed;
+} qdf_packed;
 
 /**
  * struct mac_ts_info_sch - mac ts info schedule parameters
@@ -1360,7 +1371,7 @@ struct mac_ts_info_sch {
 	uint8_t schedule:1;
 	uint8_t rsvd:7;
 #endif
-} cdf_packed;
+} qdf_packed;
 
 /**
  * struct mac_ts_info_sch - mac ts info schedule parameters
@@ -1370,7 +1381,7 @@ struct mac_ts_info_sch {
 struct mac_ts_info {
 	struct mac_ts_info_tfc traffic;
 	struct mac_ts_info_sch schedule;
-} cdf_packed;
+} qdf_packed;
 
 /**
  * struct mac_tspec_ie - mac ts spec
@@ -1412,7 +1423,7 @@ struct mac_tspec_ie {
 	uint32_t minPhyRate;
 	uint16_t surplusBw;
 	uint16_t mediumTime;
-} cdf_packed;
+} qdf_packed;
 
 /**
  * struct add_ts_param - ADDTS related parameters
@@ -1421,7 +1432,7 @@ struct mac_tspec_ie {
  * @tspec: tspec value
  * @status: CDF status
  * @sessionId: session id
- * @tsm_interval: TSM interval period passed from lim to WMA
+ * @tsm_interval: TSM interval period passed from UMAC to WMI
  * @setRICparams: RIC parameters
  * @sme_session_id: sme session id
  */
@@ -1429,7 +1440,7 @@ struct add_ts_param {
 	uint16_t staIdx;
 	uint16_t tspecIdx;
 	struct mac_tspec_ie tspec;
-	CDF_STATUS status;
+	QDF_STATUS status;
 	uint8_t sessionId;
 #ifdef FEATURE_WLAN_ESE
 	uint16_t tsm_interval;
@@ -1562,8 +1573,8 @@ struct dhcp_stop_ind_params {
 	uint16_t msgtype;
 	uint16_t msglen;
 	uint8_t device_mode;
-	struct cdf_mac_addr adapter_macaddr;
-	struct cdf_mac_addr peer_macaddr;
+	struct qdf_mac_addr adapter_macaddr;
+	struct qdf_mac_addr peer_macaddr;
 };
 
 /**
@@ -1578,7 +1589,7 @@ struct aggr_add_ts_param {
 	uint16_t staIdx;
 	uint16_t tspecIdx;
 	struct mac_tspec_ie tspec[WMI_QOS_NUM_AC_MAX];
-	CDF_STATUS status[WMI_QOS_NUM_AC_MAX];
+	QDF_STATUS status[WMI_QOS_NUM_AC_MAX];
 	uint8_t sessionId;
 };
 
@@ -1674,8 +1685,8 @@ struct rcv_pkt_filter_config {
 	enum packet_filter_type filterType;
 	uint32_t numFieldParams;
 	uint32_t coalesceTime;
-	struct cdf_mac_addr self_macaddr;
-	struct cdf_mac_addr bssid;
+	struct qdf_mac_addr self_macaddr;
+	struct qdf_mac_addr bssid;
 	struct rcv_pkt_filter_params paramsData[WMI_MAX_NUM_TESTS_PER_FILTER];
 };
 
@@ -1919,7 +1930,7 @@ struct app_type2_params {
 	uint32_t keepalive_min;
 	uint32_t keepalive_max;
 	uint32_t keepalive_inc;
-	struct cdf_mac_addr gateway_mac;
+	struct qdf_mac_addr gateway_mac;
 	uint32_t tcp_tx_timeout_val;
 	uint32_t tcp_rx_timeout_val;
 };
@@ -1935,7 +1946,7 @@ struct app_type2_params {
  */
 struct app_type1_params {
 	uint8_t vdev_id;
-	struct cdf_mac_addr wakee_mac_addr;
+	struct qdf_mac_addr wakee_mac_addr;
 	uint8_t identification_id[8];
 	uint8_t password[16];
 	uint32_t id_length;
@@ -1988,7 +1999,7 @@ struct stats_ext_params {
  * @ucPattern: Pattern buffer
  */
 struct periodic_tx_pattern {
-	struct cdf_mac_addr mac_address;
+	struct qdf_mac_addr mac_address;
 	uint8_t ucPtrnId;
 	uint16_t ucPtrnSize;
 	uint32_t usPtrnIntervalMs;
@@ -2011,7 +2022,7 @@ struct gtk_offload_params {
 	uint8_t aKCK[WMI_GTK_OFFLOAD_KCK_BYTES];
 	uint8_t aKEK[WMI_GTK_OFFLOAD_KEK_BYTES];
 	uint64_t ullKeyReplayCounter;
-	struct cdf_mac_addr bssid;
+	struct qdf_mac_addr bssid;
 };
 
 /**
@@ -2031,7 +2042,7 @@ struct flashing_req_params {
 struct wmi_host_mem_chunk {
 	uint32_t *vaddr;
 	uint32_t paddr;
-	cdf_dma_mem_context(memctx);
+	qdf_dma_mem_context(memctx);
 	uint32_t len;
 	uint32_t req_id;
 };
@@ -2156,7 +2167,7 @@ struct ns_offload_req_params {
 	uint8_t srcIPv6Addr[WMI_MAC_IPV6_ADDR_LEN];
 	uint8_t selfIPv6Addr[WMI_MAC_NUM_TARGET_IPV6_NS_OFFLOAD_NA][WMI_MAC_IPV6_ADDR_LEN];
 	uint8_t targetIPv6Addr[WMI_MAC_NUM_TARGET_IPV6_NS_OFFLOAD_NA][WMI_MAC_IPV6_ADDR_LEN];
-	struct cdf_mac_addr self_macaddr;
+	struct qdf_mac_addr self_macaddr;
 	uint8_t srcIPv6AddrValid;
 	uint8_t targetIPv6AddrValid[WMI_MAC_NUM_TARGET_IPV6_NS_OFFLOAD_NA];
 	uint8_t slotIdx;
@@ -2180,7 +2191,7 @@ struct host_offload_req_param {
 #ifdef WLAN_NS_OFFLOAD
 	struct ns_offload_req_params nsOffloadInfo;
 #endif /* WLAN_NS_OFFLOAD */
-	struct cdf_mac_addr bssid;
+	struct qdf_mac_addr bssid;
 };
 
 /**

wmi/inc/wmi_unified_priv.h

@@ -35,12 +35,12 @@
 #include "a_types.h"
 #include "wmi.h"
 #include "wmi_unified.h"
-#include "cdf_atomic.h"
+#include "qdf_atomic.h"
 
 #define WMI_UNIFIED_MAX_EVENT 0x100
 #define WMI_MAX_CMDS  1024
 
-typedef cdf_nbuf_t wmi_buf_t;
+typedef qdf_nbuf_t wmi_buf_t;
 
 #ifdef WMI_INTERFACE_EVENT_LOGGING
 
@@ -69,504 +69,504 @@ struct fwdebug {
 #endif /* WLAN_OPEN_SOURCE */
 
 struct wmi_ops {
-CDF_STATUS (*send_vdev_create_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_vdev_create_cmd)(wmi_unified_t wmi_handle,
 				 uint8_t macaddr[IEEE80211_ADDR_LEN],
 				 struct vdev_create_params *param);
 
-CDF_STATUS (*send_vdev_delete_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_vdev_delete_cmd)(wmi_unified_t wmi_handle,
 					  uint8_t if_id);
 
-CDF_STATUS (*send_vdev_stop_cmd)(wmi_unified_t wmi,
+QDF_STATUS (*send_vdev_stop_cmd)(wmi_unified_t wmi,
 					uint8_t vdev_id);
 
-CDF_STATUS (*send_vdev_down_cmd)(wmi_unified_t wmi,
+QDF_STATUS (*send_vdev_down_cmd)(wmi_unified_t wmi,
 			uint8_t vdev_id);
 
-CDF_STATUS (*send_peer_flush_tids_cmd)(wmi_unified_t wmi,
+QDF_STATUS (*send_peer_flush_tids_cmd)(wmi_unified_t wmi,
 					 uint8_t peer_addr[IEEE80211_ADDR_LEN],
 					 struct peer_flush_params *param);
 
-CDF_STATUS (*send_peer_delete_cmd)(wmi_unified_t wmi,
+QDF_STATUS (*send_peer_delete_cmd)(wmi_unified_t wmi,
 				    uint8_t peer_addr[IEEE80211_ADDR_LEN],
 				    uint8_t vdev_id);
 
-CDF_STATUS (*send_peer_param_cmd)(wmi_unified_t wmi,
+QDF_STATUS (*send_peer_param_cmd)(wmi_unified_t wmi,
 				uint8_t peer_addr[IEEE80211_ADDR_LEN],
 				struct peer_set_params *param);
 
-CDF_STATUS (*send_vdev_up_cmd)(wmi_unified_t wmi,
+QDF_STATUS (*send_vdev_up_cmd)(wmi_unified_t wmi,
 			     uint8_t bssid[IEEE80211_ADDR_LEN],
 				 struct vdev_up_params *params);
 
-CDF_STATUS (*send_peer_create_cmd)(wmi_unified_t wmi,
+QDF_STATUS (*send_peer_create_cmd)(wmi_unified_t wmi,
 					struct peer_create_params *param);
 
-CDF_STATUS (*send_green_ap_ps_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_green_ap_ps_cmd)(wmi_unified_t wmi_handle,
 						uint32_t value, uint8_t mac_id);
 
-CDF_STATUS
+QDF_STATUS
 (*send_pdev_utf_cmd)(wmi_unified_t wmi_handle,
 				struct pdev_utf_params *param,
 				uint8_t mac_id);
 
-CDF_STATUS
+QDF_STATUS
 (*send_pdev_param_cmd)(wmi_unified_t wmi_handle,
 			   struct pdev_params *param,
 				uint8_t mac_id);
 
-CDF_STATUS (*send_suspend_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_suspend_cmd)(wmi_unified_t wmi_handle,
 				struct suspend_params *param,
 				uint8_t mac_id);
 
-CDF_STATUS (*send_resume_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_resume_cmd)(wmi_unified_t wmi_handle,
 				uint8_t mac_id);
 
-CDF_STATUS (*send_wow_enable_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_wow_enable_cmd)(wmi_unified_t wmi_handle,
 				struct wow_cmd_params *param,
 				uint8_t mac_id);
 
-CDF_STATUS (*send_set_ap_ps_param_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_set_ap_ps_param_cmd)(wmi_unified_t wmi_handle,
 					   uint8_t *peer_addr,
 					   struct ap_ps_params *param);
 
-CDF_STATUS (*send_set_sta_ps_param_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_set_sta_ps_param_cmd)(wmi_unified_t wmi_handle,
 					   struct sta_ps_params *param);
 
-CDF_STATUS (*send_crash_inject_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_crash_inject_cmd)(wmi_unified_t wmi_handle,
 			 struct crash_inject *param);
 
-CDF_STATUS
+QDF_STATUS
 (*send_dbglog_cmd)(wmi_unified_t wmi_handle,
 				struct dbglog_params *dbglog_param);
 
-CDF_STATUS (*send_vdev_set_param_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_vdev_set_param_cmd)(wmi_unified_t wmi_handle,
 				struct vdev_set_params *param);
 
-CDF_STATUS (*send_stats_request_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_stats_request_cmd)(wmi_unified_t wmi_handle,
 				uint8_t macaddr[IEEE80211_ADDR_LEN],
 				struct stats_request_params *param);
 
-CDF_STATUS (*send_packet_log_enable_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_packet_log_enable_cmd)(wmi_unified_t wmi_handle,
 				uint8_t macaddr[IEEE80211_ADDR_LEN],
 				struct packet_enable_params *param);
 
-CDF_STATUS (*send_beacon_send_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_beacon_send_cmd)(wmi_unified_t wmi_handle,
 				struct beacon_params *param);
 
-CDF_STATUS (*send_peer_assoc_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_peer_assoc_cmd)(wmi_unified_t wmi_handle,
 				struct peer_assoc_params *param);
 
-CDF_STATUS (*send_scan_start_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_scan_start_cmd)(wmi_unified_t wmi_handle,
 				struct scan_start_params *param);
 
-CDF_STATUS (*send_scan_stop_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_scan_stop_cmd)(wmi_unified_t wmi_handle,
 				struct scan_stop_params *param);
 
-CDF_STATUS (*send_scan_chan_list_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_scan_chan_list_cmd)(wmi_unified_t wmi_handle,
 				struct scan_chan_list_params *param);
 
-CDF_STATUS (*send_mgmt_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_mgmt_cmd)(wmi_unified_t wmi_handle,
 				struct wmi_mgmt_params *param);
 
-CDF_STATUS (*send_modem_power_state_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_modem_power_state_cmd)(wmi_unified_t wmi_handle,
 		uint32_t param_value);
 
-CDF_STATUS (*send_set_sta_ps_mode_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_set_sta_ps_mode_cmd)(wmi_unified_t wmi_handle,
 			       uint32_t vdev_id, uint8_t val);
 
-CDF_STATUS (*send_get_temperature_cmd)(wmi_unified_t wmi_handle);
+QDF_STATUS (*send_get_temperature_cmd)(wmi_unified_t wmi_handle);
 
-CDF_STATUS (*send_set_p2pgo_oppps_req_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_set_p2pgo_oppps_req_cmd)(wmi_unified_t wmi_handle,
 		struct p2p_ps_params *oppps);
 
-CDF_STATUS (*send_set_p2pgo_noa_req_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_set_p2pgo_noa_req_cmd)(wmi_unified_t wmi_handle,
 			struct p2p_ps_params *noa);
 
-CDF_STATUS (*send_set_smps_params_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_set_smps_params_cmd)(wmi_unified_t wmi_handle,
 			  uint8_t vdev_id,
 			  int value);
 
-CDF_STATUS (*send_set_mimops_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_set_mimops_cmd)(wmi_unified_t wmi_handle,
 			uint8_t vdev_id, int value);
 
-CDF_STATUS (*send_set_sta_uapsd_auto_trig_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_set_sta_uapsd_auto_trig_cmd)(wmi_unified_t wmi_handle,
 				struct sta_uapsd_trig_params *param);
 
-CDF_STATUS (*send_ocb_set_utc_time_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_ocb_set_utc_time_cmd)(wmi_unified_t wmi_handle,
 				struct ocb_utc_param *utc);
 
-CDF_STATUS (*send_ocb_get_tsf_timer_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_ocb_get_tsf_timer_cmd)(wmi_unified_t wmi_handle,
 			  uint8_t vdev_id);
 
-CDF_STATUS (*send_ocb_start_timing_advert_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_ocb_start_timing_advert_cmd)(wmi_unified_t wmi_handle,
 	struct ocb_timing_advert_param *timing_advert);
 
-CDF_STATUS (*send_ocb_stop_timing_advert_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_ocb_stop_timing_advert_cmd)(wmi_unified_t wmi_handle,
 	struct ocb_timing_advert_param *timing_advert);
 
-CDF_STATUS (*send_dcc_get_stats_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_dcc_get_stats_cmd)(wmi_unified_t wmi_handle,
 		     struct dcc_get_stats_param *get_stats_param);
 
-CDF_STATUS (*send_dcc_clear_stats_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_dcc_clear_stats_cmd)(wmi_unified_t wmi_handle,
 				uint32_t vdev_id, uint32_t dcc_stats_bitmap);
 
-CDF_STATUS (*send_dcc_update_ndl_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_dcc_update_ndl_cmd)(wmi_unified_t wmi_handle,
 		       struct dcc_update_ndl_param *update_ndl_param);
 
-CDF_STATUS (*send_ocb_set_config_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_ocb_set_config_cmd)(wmi_unified_t wmi_handle,
 		  struct ocb_config_param *config, uint32_t *ch_mhz);
 
-CDF_STATUS (*send_lro_config_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_lro_config_cmd)(wmi_unified_t wmi_handle,
 	 struct wmi_lro_config_cmd_t *wmi_lro_cmd);
 
-CDF_STATUS (*send_set_thermal_mgmt_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_set_thermal_mgmt_cmd)(wmi_unified_t wmi_handle,
 				struct thermal_cmd_params *thermal_info);
 
-CDF_STATUS (*send_set_mcc_channel_time_quota_cmd)
+QDF_STATUS (*send_set_mcc_channel_time_quota_cmd)
 	(wmi_unified_t wmi_handle,
 	uint32_t adapter_1_chan_freq,
 	uint32_t adapter_1_quota, uint32_t adapter_2_chan_freq);
 
-CDF_STATUS (*send_set_mcc_channel_time_latency_cmd)
+QDF_STATUS (*send_set_mcc_channel_time_latency_cmd)
 	(wmi_unified_t wmi_handle,
 	uint32_t mcc_channel_freq, uint32_t mcc_channel_time_latency);
 
-CDF_STATUS (*send_set_enable_disable_mcc_adaptive_scheduler_cmd)(
+QDF_STATUS (*send_set_enable_disable_mcc_adaptive_scheduler_cmd)(
 		   wmi_unified_t wmi_handle, uint32_t mcc_adaptive_scheduler);
 
-CDF_STATUS (*send_p2p_go_set_beacon_ie_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_p2p_go_set_beacon_ie_cmd)(wmi_unified_t wmi_handle,
 				    A_UINT32 vdev_id, uint8_t *p2p_ie);
 
-CDF_STATUS (*send_probe_rsp_tmpl_send_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_probe_rsp_tmpl_send_cmd)(wmi_unified_t wmi_handle,
 			     uint8_t vdev_id,
 			     struct wmi_probe_resp_params *probe_rsp_info,
 			     uint8_t *frm);
 
-CDF_STATUS (*send_process_update_edca_param_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_process_update_edca_param_cmd)(wmi_unified_t wmi_handle,
 			     uint8_t vdev_id,
 			     wmi_wmm_vparams gwmm_param[WMI_MAX_NUM_AC]);
 
-CDF_STATUS (*send_vdev_set_gtx_cfg_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_vdev_set_gtx_cfg_cmd)(wmi_unified_t wmi_handle,
 				  uint32_t if_id,
 				  struct wmi_gtx_config *gtx_info);
 
-CDF_STATUS (*send_set_sta_keep_alive_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_set_sta_keep_alive_cmd)(wmi_unified_t wmi_handle,
 				struct sta_params *params);
 
-CDF_STATUS (*send_set_sta_sa_query_param_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_set_sta_sa_query_param_cmd)(wmi_unified_t wmi_handle,
 				       uint8_t vdev_id, uint32_t max_retries,
 					   uint32_t retry_interval);
 
-CDF_STATUS (*send_bcn_buf_ll_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_bcn_buf_ll_cmd)(wmi_unified_t wmi_handle,
 			wmi_bcn_send_from_host_cmd_fixed_param *param);
 
-CDF_STATUS (*send_set_gateway_params_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_set_gateway_params_cmd)(wmi_unified_t wmi_handle,
 					struct gateway_update_req_param *req);
 
-CDF_STATUS (*send_set_rssi_monitoring_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_set_rssi_monitoring_cmd)(wmi_unified_t wmi_handle,
 					struct rssi_monitor_param *req);
 
-CDF_STATUS (*send_scan_probe_setoui_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_scan_probe_setoui_cmd)(wmi_unified_t wmi_handle,
 			  struct scan_mac_oui *psetoui);
 
-CDF_STATUS (*send_reset_passpoint_network_list_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_reset_passpoint_network_list_cmd)(wmi_unified_t wmi_handle,
 					struct wifi_passpoint_req_param *req);
 
-CDF_STATUS (*send_set_passpoint_network_list_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_set_passpoint_network_list_cmd)(wmi_unified_t wmi_handle,
 					struct wifi_passpoint_req_param *req);
 
-CDF_STATUS (*send_set_epno_network_list_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_set_epno_network_list_cmd)(wmi_unified_t wmi_handle,
 		struct wifi_enhanched_pno_params *req);
 
-CDF_STATUS (*send_extscan_get_capabilities_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_extscan_get_capabilities_cmd)(wmi_unified_t wmi_handle,
 			  struct extscan_capabilities_params *pgetcapab);
 
-CDF_STATUS (*send_extscan_get_cached_results_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_extscan_get_cached_results_cmd)(wmi_unified_t wmi_handle,
 			  struct extscan_cached_result_params *pcached_results);
 
-CDF_STATUS (*send_extscan_stop_change_monitor_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_extscan_stop_change_monitor_cmd)(wmi_unified_t wmi_handle,
 			  struct extscan_capabilities_reset_params *reset_req);
 
-CDF_STATUS (*send_extscan_start_change_monitor_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_extscan_start_change_monitor_cmd)(wmi_unified_t wmi_handle,
 		struct extscan_set_sig_changereq_params *
 		psigchange);
 
-CDF_STATUS (*send_extscan_stop_hotlist_monitor_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_extscan_stop_hotlist_monitor_cmd)(wmi_unified_t wmi_handle,
 		struct extscan_bssid_hotlist_reset_params *photlist_reset);
 
-CDF_STATUS (*send_stop_extscan_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_stop_extscan_cmd)(wmi_unified_t wmi_handle,
 		  struct extscan_stop_req_params *pstopcmd);
 
-CDF_STATUS (*send_start_extscan_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_start_extscan_cmd)(wmi_unified_t wmi_handle,
 		    struct wifi_scan_cmd_req_params *pstart);
 
-CDF_STATUS (*send_plm_stop_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_plm_stop_cmd)(wmi_unified_t wmi_handle,
 		 const struct plm_req_params *plm);
 
-CDF_STATUS (*send_plm_start_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_plm_start_cmd)(wmi_unified_t wmi_handle,
 		  const struct plm_req_params *plm,
 		  uint32_t *gchannel_list);
 
-CDF_STATUS (*send_csa_offload_enable_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_csa_offload_enable_cmd)(wmi_unified_t wmi_handle,
 			uint8_t vdev_id);
 
-CDF_STATUS (*send_pno_stop_cmd)(wmi_unified_t wmi_handle, uint8_t vdev_id);
+QDF_STATUS (*send_pno_stop_cmd)(wmi_unified_t wmi_handle, uint8_t vdev_id);
 
-CDF_STATUS (*send_pno_start_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_pno_start_cmd)(wmi_unified_t wmi_handle,
 		   struct pno_scan_req_params *pno,
 		   uint32_t *gchannel_freq_list);
 
-CDF_STATUS (*send_ipa_offload_control_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_ipa_offload_control_cmd)(wmi_unified_t wmi_handle,
 		struct ipa_offload_control_params *ipa_offload);
 
-CDF_STATUS (*send_set_ric_req_cmd)(wmi_unified_t wmi_handle, void *msg,
+QDF_STATUS (*send_set_ric_req_cmd)(wmi_unified_t wmi_handle, void *msg,
 			uint8_t is_add_ts);
 
-CDF_STATUS (*send_process_ll_stats_clear_cmd)
+QDF_STATUS (*send_process_ll_stats_clear_cmd)
 	   (wmi_unified_t wmi_handle,
 	   const struct ll_stats_clear_params *clear_req,
 	   uint8_t addr[IEEE80211_ADDR_LEN]);
 
-CDF_STATUS (*send_process_ll_stats_set_cmd)
+QDF_STATUS (*send_process_ll_stats_set_cmd)
 	(wmi_unified_t wmi_handle, const struct ll_stats_set_params *set_req);
 
-CDF_STATUS (*send_process_ll_stats_get_cmd)
+QDF_STATUS (*send_process_ll_stats_get_cmd)
 	(wmi_unified_t wmi_handle, const struct ll_stats_get_params  *get_req,
 		 uint8_t addr[IEEE80211_ADDR_LEN]);
 
-CDF_STATUS (*send_get_stats_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_get_stats_cmd)(wmi_unified_t wmi_handle,
 		       struct pe_stats_req  *get_stats_param,
 			   uint8_t addr[IEEE80211_ADDR_LEN]);
 
-CDF_STATUS (*send_snr_request_cmd)(wmi_unified_t wmi_handle);
+QDF_STATUS (*send_snr_request_cmd)(wmi_unified_t wmi_handle);
 
-CDF_STATUS (*send_snr_cmd)(wmi_unified_t wmi_handle, uint8_t vdev_id);
+QDF_STATUS (*send_snr_cmd)(wmi_unified_t wmi_handle, uint8_t vdev_id);
 
-CDF_STATUS (*send_link_status_req_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_link_status_req_cmd)(wmi_unified_t wmi_handle,
 				 struct link_status_params *link_status);
 
-CDF_STATUS (*send_lphb_config_hbenable_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_lphb_config_hbenable_cmd)(wmi_unified_t wmi_handle,
 				wmi_hb_set_enable_cmd_fixed_param *params);
 
-CDF_STATUS (*send_lphb_config_tcp_params_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_lphb_config_tcp_params_cmd)(wmi_unified_t wmi_handle,
 				    wmi_hb_set_tcp_params_cmd_fixed_param *lphb_conf_req);
 
-CDF_STATUS (*send_lphb_config_tcp_pkt_filter_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_lphb_config_tcp_pkt_filter_cmd)(wmi_unified_t wmi_handle,
 				wmi_hb_set_tcp_pkt_filter_cmd_fixed_param *g_hb_tcp_filter_fp);
 
-CDF_STATUS (*send_lphb_config_udp_params_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_lphb_config_udp_params_cmd)(wmi_unified_t wmi_handle,
 				    wmi_hb_set_udp_params_cmd_fixed_param *lphb_conf_req);
 
-CDF_STATUS (*send_lphb_config_udp_pkt_filter_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_lphb_config_udp_pkt_filter_cmd)(wmi_unified_t wmi_handle,
 					wmi_hb_set_udp_pkt_filter_cmd_fixed_param *lphb_conf_req);
 
-CDF_STATUS (*send_process_dhcp_ind_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_process_dhcp_ind_cmd)(wmi_unified_t wmi_handle,
 				wmi_peer_set_param_cmd_fixed_param *ta_dhcp_ind);
 
-CDF_STATUS (*send_get_link_speed_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_get_link_speed_cmd)(wmi_unified_t wmi_handle,
 			wmi_mac_addr peer_macaddr);
 
-CDF_STATUS (*send_egap_conf_params_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_egap_conf_params_cmd)(wmi_unified_t wmi_handle,
 				     wmi_ap_ps_egap_param_cmd_fixed_param *egap_params);
 
-CDF_STATUS (*send_fw_profiling_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_fw_profiling_cmd)(wmi_unified_t wmi_handle,
 			uint32_t cmd, uint32_t value1, uint32_t value2);
 
-CDF_STATUS (*send_wow_sta_ra_filter_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_wow_sta_ra_filter_cmd)(wmi_unified_t wmi_handle,
 				   uint8_t vdev_id, uint8_t default_pattern,
 				   uint16_t rate_limit_interval);
 
-CDF_STATUS (*send_nat_keepalive_en_cmd)(wmi_unified_t wmi_handle, uint8_t vdev_id);
+QDF_STATUS (*send_nat_keepalive_en_cmd)(wmi_unified_t wmi_handle, uint8_t vdev_id);
 
-CDF_STATUS (*send_start_oem_data_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_start_oem_data_cmd)(wmi_unified_t wmi_handle,
 			  uint8_t data_len,
 			  uint8_t *data);
 
-CDF_STATUS
+QDF_STATUS
 (*send_dfs_phyerr_filter_offload_en_cmd)(wmi_unified_t wmi_handle,
 			bool dfs_phyerr_filter_offload);
 
-CDF_STATUS (*send_pktlog_wmi_send_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_pktlog_wmi_send_cmd)(wmi_unified_t wmi_handle,
 				   WMI_PKTLOG_EVENT pktlog_event,
 				   WMI_CMD_ID cmd_id);
 
-CDF_STATUS (*send_add_wow_wakeup_event_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_add_wow_wakeup_event_cmd)(wmi_unified_t wmi_handle,
 					uint32_t vdev_id,
 					uint32_t bitmap,
 					bool enable);
 
-CDF_STATUS (*send_wow_patterns_to_fw_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_wow_patterns_to_fw_cmd)(wmi_unified_t wmi_handle,
 				uint8_t vdev_id, uint8_t ptrn_id,
 				const uint8_t *ptrn, uint8_t ptrn_len,
 				uint8_t ptrn_offset, const uint8_t *mask,
 				uint8_t mask_len, bool user,
 				uint8_t default_patterns);
 
-CDF_STATUS (*send_wow_delete_pattern_cmd)(wmi_unified_t wmi_handle, uint8_t ptrn_id,
+QDF_STATUS (*send_wow_delete_pattern_cmd)(wmi_unified_t wmi_handle, uint8_t ptrn_id,
 					uint8_t vdev_id);
 
-CDF_STATUS (*send_host_wakeup_ind_to_fw_cmd)(wmi_unified_t wmi_handle);
+QDF_STATUS (*send_host_wakeup_ind_to_fw_cmd)(wmi_unified_t wmi_handle);
 
-CDF_STATUS (*send_del_ts_cmd)(wmi_unified_t wmi_handle, uint8_t vdev_id,
+QDF_STATUS (*send_del_ts_cmd)(wmi_unified_t wmi_handle, uint8_t vdev_id,
 				uint8_t ac);
 
-CDF_STATUS (*send_aggr_qos_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_aggr_qos_cmd)(wmi_unified_t wmi_handle,
 		      struct aggr_add_ts_param *aggr_qos_rsp_msg);
 
-CDF_STATUS (*send_add_ts_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_add_ts_cmd)(wmi_unified_t wmi_handle,
 		 struct add_ts_param *msg);
 
-CDF_STATUS (*send_enable_disable_packet_filter_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_enable_disable_packet_filter_cmd)(wmi_unified_t wmi_handle,
 					uint8_t vdev_id, bool enable);
 
-CDF_STATUS (*send_config_packet_filter_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_config_packet_filter_cmd)(wmi_unified_t wmi_handle,
 		uint8_t vdev_id, struct rcv_pkt_filter_config *rcv_filter_param,
 		uint8_t filter_id, bool enable);
 
-CDF_STATUS (*send_add_clear_mcbc_filter_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_add_clear_mcbc_filter_cmd)(wmi_unified_t wmi_handle,
 				     uint8_t vdev_id,
-				     struct cdf_mac_addr multicast_addr,
+				     struct qdf_mac_addr multicast_addr,
 				     bool clearList);
 
-CDF_STATUS (*send_gtk_offload_cmd)(wmi_unified_t wmi_handle, uint8_t vdev_id,
+QDF_STATUS (*send_gtk_offload_cmd)(wmi_unified_t wmi_handle, uint8_t vdev_id,
 					   struct gtk_offload_params *params,
 					   bool enable_offload,
 					   uint32_t gtk_offload_opcode);
 
-CDF_STATUS (*send_process_gtk_offload_getinfo_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_process_gtk_offload_getinfo_cmd)(wmi_unified_t wmi_handle,
 				uint8_t vdev_id,
 				uint64_t offload_req_opcode);
 
-CDF_STATUS (*send_process_add_periodic_tx_ptrn_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_process_add_periodic_tx_ptrn_cmd)(wmi_unified_t wmi_handle,
 						struct periodic_tx_pattern  *
 						pAddPeriodicTxPtrnParams,
 						uint8_t vdev_id);
 
-CDF_STATUS (*send_process_del_periodic_tx_ptrn_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_process_del_periodic_tx_ptrn_cmd)(wmi_unified_t wmi_handle,
 						uint8_t vdev_id,
 						uint8_t pattern_id);
 
-CDF_STATUS (*send_stats_ext_req_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_stats_ext_req_cmd)(wmi_unified_t wmi_handle,
 			struct stats_ext_params *preq);
 
-CDF_STATUS (*send_enable_ext_wow_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_enable_ext_wow_cmd)(wmi_unified_t wmi_handle,
 			struct ext_wow_params *params);
 
-CDF_STATUS (*send_set_app_type2_params_in_fw_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_set_app_type2_params_in_fw_cmd)(wmi_unified_t wmi_handle,
 					  struct app_type2_params *appType2Params);
 
-CDF_STATUS (*send_set_auto_shutdown_timer_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_set_auto_shutdown_timer_cmd)(wmi_unified_t wmi_handle,
 						  uint32_t timer_val);
 
-CDF_STATUS (*send_nan_req_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_nan_req_cmd)(wmi_unified_t wmi_handle,
 			struct nan_req_params *nan_req);
 
-CDF_STATUS (*send_process_dhcpserver_offload_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_process_dhcpserver_offload_cmd)(wmi_unified_t wmi_handle,
 				struct dhcp_offload_info_params *pDhcpSrvOffloadInfo);
 
-CDF_STATUS (*send_process_ch_avoid_update_cmd)(wmi_unified_t wmi_handle);
+QDF_STATUS (*send_process_ch_avoid_update_cmd)(wmi_unified_t wmi_handle);
 
-CDF_STATUS (*send_regdomain_info_to_fw_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_regdomain_info_to_fw_cmd)(wmi_unified_t wmi_handle,
 				   uint32_t reg_dmn, uint16_t regdmn2G,
 				   uint16_t regdmn5G, int8_t ctl2G,
 				   int8_t ctl5G);
 
-CDF_STATUS (*send_set_tdls_offchan_mode_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_set_tdls_offchan_mode_cmd)(wmi_unified_t wmi_handle,
 			      struct tdls_channel_switch_params *chan_switch_params);
 
-CDF_STATUS (*send_update_fw_tdls_state_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_update_fw_tdls_state_cmd)(wmi_unified_t wmi_handle,
 					 void *tdls_param, uint8_t tdls_state);
 
-CDF_STATUS (*send_update_tdls_peer_state_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_update_tdls_peer_state_cmd)(wmi_unified_t wmi_handle,
 			       struct tdls_peer_state_params *peerStateParams,
 				   uint32_t *ch_mhz);
 
 
-CDF_STATUS (*send_process_fw_mem_dump_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_process_fw_mem_dump_cmd)(wmi_unified_t wmi_handle,
 					struct fw_dump_req_param *mem_dump_req);
 
-CDF_STATUS (*send_process_set_ie_info_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_process_set_ie_info_cmd)(wmi_unified_t wmi_handle,
 				   struct vdev_ie_info_param *ie_info);
 
-CDF_STATUS (*send_init_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_init_cmd)(wmi_unified_t wmi_handle,
 		wmi_resource_config *res_cfg,
 		uint8_t num_mem_chunks, struct wmi_host_mem_chunk *mem_chunk,
 		bool action);
 
-CDF_STATUS (*save_fw_version_cmd)(wmi_unified_t wmi_handle, void *evt_buf);
+QDF_STATUS (*save_fw_version_cmd)(wmi_unified_t wmi_handle, void *evt_buf);
 
-CDF_STATUS (*check_and_update_fw_version_cmd)(wmi_unified_t wmi_hdl, void *ev);
+QDF_STATUS (*check_and_update_fw_version_cmd)(wmi_unified_t wmi_hdl, void *ev);
 
-CDF_STATUS (*send_saved_init_cmd)(wmi_unified_t wmi_handle);
+QDF_STATUS (*send_saved_init_cmd)(wmi_unified_t wmi_handle);
 
-CDF_STATUS (*send_set_base_macaddr_indicate_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_set_base_macaddr_indicate_cmd)(wmi_unified_t wmi_handle,
 					 uint8_t *custom_addr);
 
-CDF_STATUS (*send_log_supported_evt_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_log_supported_evt_cmd)(wmi_unified_t wmi_handle,
 		uint8_t *event,
 		uint32_t len);
 
-CDF_STATUS (*send_enable_specific_fw_logs_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_enable_specific_fw_logs_cmd)(wmi_unified_t wmi_handle,
 		struct wmi_wifi_start_log *start_log);
 
-CDF_STATUS (*send_flush_logs_to_fw_cmd)(wmi_unified_t wmi_handle);
+QDF_STATUS (*send_flush_logs_to_fw_cmd)(wmi_unified_t wmi_handle);
 
-CDF_STATUS (*send_soc_set_pcl_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_soc_set_pcl_cmd)(wmi_unified_t wmi_handle,
 				struct wmi_pcl_list *msg);
 
-CDF_STATUS (*send_soc_set_hw_mode_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_soc_set_hw_mode_cmd)(wmi_unified_t wmi_handle,
 				uint32_t hw_mode_index);
 
-CDF_STATUS (*send_soc_set_dual_mac_config_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_soc_set_dual_mac_config_cmd)(wmi_unified_t wmi_handle,
 		struct wmi_dual_mac_config *msg);
 
-CDF_STATUS (*send_enable_arp_ns_offload_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_enable_arp_ns_offload_cmd)(wmi_unified_t wmi_handle,
 			   struct host_offload_req_param *param, bool arp_only,
 			   uint8_t vdev_id);
 
-CDF_STATUS (*send_set_led_flashing_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_set_led_flashing_cmd)(wmi_unified_t wmi_handle,
 				struct flashing_req_params *flashing);
 
-CDF_STATUS (*send_app_type1_params_in_fw_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_app_type1_params_in_fw_cmd)(wmi_unified_t wmi_handle,
 				   struct app_type1_params *app_type1_params);
 
-CDF_STATUS (*send_set_ssid_hotlist_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_set_ssid_hotlist_cmd)(wmi_unified_t wmi_handle,
 		     struct ssid_hotlist_request_params *request);
 
-CDF_STATUS (*send_process_roam_synch_complete_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_process_roam_synch_complete_cmd)(wmi_unified_t wmi_handle,
 		 uint8_t vdev_id);
 
-CDF_STATUS (*send_unit_test_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_unit_test_cmd)(wmi_unified_t wmi_handle,
 			       struct wmi_unit_test_cmd *wmi_utest);
 
-CDF_STATUS (*send_roam_invoke_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_roam_invoke_cmd)(wmi_unified_t wmi_handle,
 		struct wmi_roam_invoke_cmd *roaminvoke,
 		uint32_t ch_hz);
 
-CDF_STATUS (*send_roam_scan_offload_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_roam_scan_offload_cmd)(wmi_unified_t wmi_handle,
 				 uint32_t command, uint32_t vdev_id);
 
-CDF_STATUS (*send_roam_scan_offload_ap_profile_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_roam_scan_offload_ap_profile_cmd)(wmi_unified_t wmi_handle,
 				    wmi_ap_profile *ap_profile_p,
 				    uint32_t vdev_id);
 
-CDF_STATUS (*send_roam_scan_offload_scan_period_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_roam_scan_offload_scan_period_cmd)(wmi_unified_t wmi_handle,
 				     uint32_t scan_period,
 				     uint32_t scan_age,
 				     uint32_t vdev_id);
 
-CDF_STATUS (*send_roam_scan_offload_chan_list_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_roam_scan_offload_chan_list_cmd)(wmi_unified_t wmi_handle,
 				   uint8_t chan_count,
 				   uint8_t *chan_list,
 				   uint8_t list_type, uint32_t vdev_id);
 
-CDF_STATUS (*send_roam_scan_offload_rssi_change_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_roam_scan_offload_rssi_change_cmd)(wmi_unified_t wmi_handle,
 	uint32_t vdev_id,
 	int32_t rssi_change_thresh,
 	uint32_t bcn_rssi_weight,
 	uint32_t hirssi_delay_btw_scans);
 
-CDF_STATUS (*send_get_buf_extscan_hotlist_cmd)(wmi_unified_t wmi_handle,
+QDF_STATUS (*send_get_buf_extscan_hotlist_cmd)(wmi_unified_t wmi_handle,
 				   struct ext_scan_setbssi_hotlist_params *
 				   photlist, int *buf_len);
 };
@@ -584,7 +584,7 @@ struct wmi_init_cmd {
 struct wmi_unified {
 	ol_scn_t scn_handle;    /* handle to device */
 	osdev_t  osdev; /* handle to use OS-independent services */
-	cdf_atomic_t pending_cmds;
+	qdf_atomic_t pending_cmds;
 	HTC_ENDPOINT_ID wmi_endpoint_id;
 	uint16_t max_msg_len;
 	WMI_EVT_ID event_id[WMI_UNIFIED_MAX_EVENT];
@@ -592,8 +592,8 @@ struct wmi_unified {
 	enum wmi_rx_exec_ctx ctx[WMI_UNIFIED_MAX_EVENT];
 	uint32_t max_event_idx;
 	void *htc_handle;
-	cdf_spinlock_t eventq_lock;
-	cdf_nbuf_queue_t event_queue;
+	qdf_spinlock_t eventq_lock;
+	qdf_nbuf_queue_t event_queue;
 	struct work_struct rx_event_work;
 	int wmi_stop_in_progress;
 	struct _wmi_abi_version fw_abi_version;
@@ -608,13 +608,13 @@ struct wmi_unified {
 #endif /* WLAN_OPEN_SOURCE */
 
 #ifdef WMI_INTERFACE_EVENT_LOGGING
-	cdf_spinlock_t wmi_record_lock;
+	qdf_spinlock_t wmi_record_lock;
 #endif /*WMI_INTERFACE_EVENT_LOGGING */
 
-	cdf_atomic_t is_target_suspended;
+	qdf_atomic_t is_target_suspended;
 
 #ifdef FEATURE_RUNTIME_PM
-	cdf_atomic_t runtime_pm_inprogress;
+	qdf_atomic_t runtime_pm_inprogress;
 #endif
 
 	struct wmi_rx_ops rx_ops;

wmi/inc/wmi_unified_tlv.h

@@ -31,505 +31,505 @@
 #include "wmi_unified_param.h"
 #include "ol_defines.h" /* Fix Me: wmi_unified_t structure definition */
 
-CDF_STATUS send_vdev_create_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_vdev_create_cmd_tlv(wmi_unified_t wmi_handle,
 				 uint8_t macaddr[IEEE80211_ADDR_LEN],
 				 struct vdev_create_params *param);
 
-CDF_STATUS send_vdev_delete_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_vdev_delete_cmd_tlv(wmi_unified_t wmi_handle,
 					  uint8_t if_id);
 
-CDF_STATUS send_vdev_stop_cmd_tlv(wmi_unified_t wmi,
+QDF_STATUS send_vdev_stop_cmd_tlv(wmi_unified_t wmi,
 					uint8_t vdev_id);
 
-CDF_STATUS send_vdev_down_cmd_tlv(wmi_unified_t wmi,
+QDF_STATUS send_vdev_down_cmd_tlv(wmi_unified_t wmi,
 			uint8_t vdev_id);
 
-CDF_STATUS send_peer_flush_tids_cmd_tlv(wmi_unified_t wmi,
+QDF_STATUS send_peer_flush_tids_cmd_tlv(wmi_unified_t wmi,
 			 uint8_t peer_addr[IEEE80211_ADDR_LEN],
 			 struct peer_flush_params *param);
 
-CDF_STATUS send_peer_delete_cmd_tlv(wmi_unified_t wmi,
+QDF_STATUS send_peer_delete_cmd_tlv(wmi_unified_t wmi,
 			    uint8_t peer_addr[IEEE80211_ADDR_LEN],
 			    uint8_t vdev_id);
 
-CDF_STATUS send_peer_param_cmd_tlv(wmi_unified_t wmi,
+QDF_STATUS send_peer_param_cmd_tlv(wmi_unified_t wmi,
 				uint8_t peer_addr[IEEE80211_ADDR_LEN],
 				struct peer_set_params *param);
 
-CDF_STATUS send_vdev_up_cmd_tlv(wmi_unified_t wmi,
+QDF_STATUS send_vdev_up_cmd_tlv(wmi_unified_t wmi,
 			     uint8_t bssid[IEEE80211_ADDR_LEN],
 				 struct vdev_up_params *params);
 
-CDF_STATUS send_peer_create_cmd_tlv(wmi_unified_t wmi,
+QDF_STATUS send_peer_create_cmd_tlv(wmi_unified_t wmi,
 					struct peer_create_params *param);
 
-CDF_STATUS send_green_ap_ps_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_green_ap_ps_cmd_tlv(wmi_unified_t wmi_handle,
 						uint32_t value, uint8_t mac_id);
 
-CDF_STATUS
+QDF_STATUS
 send_pdev_utf_cmd_tlv(wmi_unified_t wmi_handle,
 				struct pdev_utf_params *param,
 				uint8_t mac_id);
 
-CDF_STATUS
+QDF_STATUS
 send_pdev_param_cmd_tlv(wmi_unified_t wmi_handle,
 			   struct pdev_params *param,
 				uint8_t mac_id);
 
-CDF_STATUS send_suspend_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_suspend_cmd_tlv(wmi_unified_t wmi_handle,
 				struct suspend_params *param,
 				uint8_t mac_id);
 
-CDF_STATUS send_resume_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_resume_cmd_tlv(wmi_unified_t wmi_handle,
 				uint8_t mac_id);
 
-CDF_STATUS send_wow_enable_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_wow_enable_cmd_tlv(wmi_unified_t wmi_handle,
 				struct wow_cmd_params *param,
 				uint8_t mac_id);
 
-CDF_STATUS send_set_ap_ps_param_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_set_ap_ps_param_cmd_tlv(wmi_unified_t wmi_handle,
 					   uint8_t *peer_addr,
 					   struct ap_ps_params *param);
 
-CDF_STATUS send_set_sta_ps_param_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_set_sta_ps_param_cmd_tlv(wmi_unified_t wmi_handle,
 					   struct sta_ps_params *param);
 
-CDF_STATUS send_crash_inject_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_crash_inject_cmd_tlv(wmi_unified_t wmi_handle,
 			 struct crash_inject *param);
 
-CDF_STATUS
+QDF_STATUS
 send_dbglog_cmd_tlv(wmi_unified_t wmi_handle,
 				struct dbglog_params *dbglog_param);
 
 
-CDF_STATUS send_vdev_set_param_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_vdev_set_param_cmd_tlv(wmi_unified_t wmi_handle,
 				struct vdev_set_params *param);
 
-CDF_STATUS send_stats_request_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_stats_request_cmd_tlv(wmi_unified_t wmi_handle,
 				uint8_t macaddr[IEEE80211_ADDR_LEN],
 				struct stats_request_params *param);
 
-CDF_STATUS send_packet_log_enable_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_packet_log_enable_cmd_tlv(wmi_unified_t wmi_handle,
 				uint8_t macaddr[IEEE80211_ADDR_LEN],
 				struct packet_enable_params *param);
 
-CDF_STATUS send_beacon_send_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_beacon_send_cmd_tlv(wmi_unified_t wmi_handle,
 				struct beacon_params *param);
 
-CDF_STATUS send_peer_assoc_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_peer_assoc_cmd_tlv(wmi_unified_t wmi_handle,
 				struct peer_assoc_params *param);
 
-CDF_STATUS send_scan_start_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_scan_start_cmd_tlv(wmi_unified_t wmi_handle,
 				struct scan_start_params *param);
 
-CDF_STATUS send_scan_stop_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_scan_stop_cmd_tlv(wmi_unified_t wmi_handle,
 				struct scan_stop_params *param);
 
-CDF_STATUS send_scan_chan_list_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_scan_chan_list_cmd_tlv(wmi_unified_t wmi_handle,
 				struct scan_chan_list_params *param);
 
-CDF_STATUS send_mgmt_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_mgmt_cmd_tlv(wmi_unified_t wmi_handle,
 				struct wmi_mgmt_params *param);
 
-CDF_STATUS send_modem_power_state_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_modem_power_state_cmd_tlv(wmi_unified_t wmi_handle,
 		uint32_t param_value);
 
-CDF_STATUS send_set_sta_ps_mode_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_set_sta_ps_mode_cmd_tlv(wmi_unified_t wmi_handle,
 			       uint32_t vdev_id, uint8_t val);
 
-CDF_STATUS send_set_sta_uapsd_auto_trig_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_set_sta_uapsd_auto_trig_cmd_tlv(wmi_unified_t wmi_handle,
 				struct sta_uapsd_trig_params *param);
 
-CDF_STATUS send_get_temperature_cmd_tlv(wmi_unified_t wmi_handle);
+QDF_STATUS send_get_temperature_cmd_tlv(wmi_unified_t wmi_handle);
 
-CDF_STATUS send_set_p2pgo_oppps_req_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_set_p2pgo_oppps_req_cmd_tlv(wmi_unified_t wmi_handle,
 		struct p2p_ps_params *oppps);
 
-CDF_STATUS send_set_p2pgo_noa_req_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_set_p2pgo_noa_req_cmd_tlv(wmi_unified_t wmi_handle,
 			struct p2p_ps_params *noa);
 
-CDF_STATUS send_set_smps_params_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_set_smps_params_cmd_tlv(wmi_unified_t wmi_handle,
 			       uint8_t vdev_id,
 			       int value);
 
-CDF_STATUS send_set_mimops_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_set_mimops_cmd_tlv(wmi_unified_t wmi_handle,
 			uint8_t vdev_id, int value);
 
-CDF_STATUS send_ocb_set_utc_time_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_ocb_set_utc_time_cmd_tlv(wmi_unified_t wmi_handle,
 				struct ocb_utc_param *utc);
 
-CDF_STATUS send_ocb_start_timing_advert_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_ocb_start_timing_advert_cmd_tlv(wmi_unified_t wmi_handle,
 	struct ocb_timing_advert_param *timing_advert);
 
-CDF_STATUS send_ocb_stop_timing_advert_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_ocb_stop_timing_advert_cmd_tlv(wmi_unified_t wmi_handle,
 	struct ocb_timing_advert_param *timing_advert);
 
-CDF_STATUS send_ocb_get_tsf_timer_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_ocb_get_tsf_timer_cmd_tlv(wmi_unified_t wmi_handle,
 			  uint8_t vdev_id);
 
-CDF_STATUS send_dcc_get_stats_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_dcc_get_stats_cmd_tlv(wmi_unified_t wmi_handle,
 		     struct dcc_get_stats_param *get_stats_param);
 
-CDF_STATUS send_dcc_clear_stats_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_dcc_clear_stats_cmd_tlv(wmi_unified_t wmi_handle,
 				uint32_t vdev_id, uint32_t dcc_stats_bitmap);
 
-CDF_STATUS send_dcc_update_ndl_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_dcc_update_ndl_cmd_tlv(wmi_unified_t wmi_handle,
 		       struct dcc_update_ndl_param *update_ndl_param);
 
-CDF_STATUS send_ocb_set_config_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_ocb_set_config_cmd_tlv(wmi_unified_t wmi_handle,
 		struct ocb_config_param *config, uint32_t *ch_mhz);
-CDF_STATUS send_lro_config_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_lro_config_cmd_tlv(wmi_unified_t wmi_handle,
 	 struct wmi_lro_config_cmd_t *wmi_lro_cmd);
 
-CDF_STATUS send_set_thermal_mgmt_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_set_thermal_mgmt_cmd_tlv(wmi_unified_t wmi_handle,
 				struct thermal_cmd_params *thermal_info);
 
-CDF_STATUS send_set_mcc_channel_time_quota_cmd_tlv
+QDF_STATUS send_set_mcc_channel_time_quota_cmd_tlv
 	(wmi_unified_t wmi_handle,
 	uint32_t adapter_1_chan_freq,
 	uint32_t adapter_1_quota, uint32_t adapter_2_chan_freq);
 
-CDF_STATUS send_set_mcc_channel_time_latency_cmd_tlv
+QDF_STATUS send_set_mcc_channel_time_latency_cmd_tlv
 	(wmi_unified_t wmi_handle,
 	uint32_t mcc_channel_freq, uint32_t mcc_channel_time_latency);
 
-CDF_STATUS send_set_enable_disable_mcc_adaptive_scheduler_cmd_tlv(
+QDF_STATUS send_set_enable_disable_mcc_adaptive_scheduler_cmd_tlv(
 		   wmi_unified_t wmi_handle, uint32_t mcc_adaptive_scheduler);
 
-CDF_STATUS send_p2p_go_set_beacon_ie_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_p2p_go_set_beacon_ie_cmd_tlv(wmi_unified_t wmi_handle,
 				    A_UINT32 vdev_id, uint8_t *p2p_ie);
 
-CDF_STATUS send_probe_rsp_tmpl_send_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_probe_rsp_tmpl_send_cmd_tlv(wmi_unified_t wmi_handle,
 				   uint8_t vdev_id,
 				   struct wmi_probe_resp_params *probe_rsp_info,
 				   uint8_t *frm);
 
-CDF_STATUS send_process_update_edca_param_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_process_update_edca_param_cmd_tlv(wmi_unified_t wmi_handle,
 				    uint8_t vdev_id,
 				    wmi_wmm_vparams gwmm_param[WMI_MAX_NUM_AC]);
 
-CDF_STATUS send_vdev_set_gtx_cfg_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_vdev_set_gtx_cfg_cmd_tlv(wmi_unified_t wmi_handle,
 				  uint32_t if_id,
 				  struct wmi_gtx_config *gtx_info);
 
-CDF_STATUS send_set_sta_keep_alive_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_set_sta_keep_alive_cmd_tlv(wmi_unified_t wmi_handle,
 				struct sta_params *params);
 
-CDF_STATUS send_set_sta_sa_query_param_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_set_sta_sa_query_param_cmd_tlv(wmi_unified_t wmi_handle,
 				       uint8_t vdev_id, uint32_t max_retries,
 					   uint32_t retry_interval);
 
-CDF_STATUS send_bcn_buf_ll_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_bcn_buf_ll_cmd_tlv(wmi_unified_t wmi_handle,
 			wmi_bcn_send_from_host_cmd_fixed_param *param);
 
-CDF_STATUS send_set_gateway_params_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_set_gateway_params_cmd_tlv(wmi_unified_t wmi_handle,
 					struct gateway_update_req_param *req);
 
-CDF_STATUS send_set_rssi_monitoring_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_set_rssi_monitoring_cmd_tlv(wmi_unified_t wmi_handle,
 					struct rssi_monitor_param *req);
 
-CDF_STATUS  send_ipa_offload_control_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS  send_ipa_offload_control_cmd_tlv(wmi_unified_t wmi_handle,
 		struct ipa_offload_control_params *ipa_offload);
 
-CDF_STATUS send_scan_probe_setoui_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_scan_probe_setoui_cmd_tlv(wmi_unified_t wmi_handle,
 			  struct scan_mac_oui *psetoui);
 
-CDF_STATUS send_reset_passpoint_network_list_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_reset_passpoint_network_list_cmd_tlv(wmi_unified_t wmi_handle,
 					struct wifi_passpoint_req_param *req);
 
-CDF_STATUS send_set_passpoint_network_list_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_set_passpoint_network_list_cmd_tlv(wmi_unified_t wmi_handle,
 					struct wifi_passpoint_req_param *req);
 
-CDF_STATUS send_set_ric_req_cmd_tlv(wmi_unified_t wmi_handle, void *msg,
+QDF_STATUS send_set_ric_req_cmd_tlv(wmi_unified_t wmi_handle, void *msg,
 			uint8_t is_add_ts);
 
-CDF_STATUS send_set_epno_network_list_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_set_epno_network_list_cmd_tlv(wmi_unified_t wmi_handle,
 		struct wifi_enhanched_pno_params *req);
 
-CDF_STATUS send_extscan_get_capabilities_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_extscan_get_capabilities_cmd_tlv(wmi_unified_t wmi_handle,
 			  struct extscan_capabilities_params *pgetcapab);
 
-CDF_STATUS send_extscan_get_cached_results_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_extscan_get_cached_results_cmd_tlv(wmi_unified_t wmi_handle,
 			  struct extscan_cached_result_params *pcached_results);
 
-CDF_STATUS send_extscan_stop_change_monitor_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_extscan_stop_change_monitor_cmd_tlv(wmi_unified_t wmi_handle,
 			  struct extscan_capabilities_reset_params *reset_req);
 
-CDF_STATUS send_extscan_start_change_monitor_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_extscan_start_change_monitor_cmd_tlv(wmi_unified_t wmi_handle,
 				   struct extscan_set_sig_changereq_params *
 					   psigchange);
 
-CDF_STATUS send_extscan_stop_hotlist_monitor_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_extscan_stop_hotlist_monitor_cmd_tlv(wmi_unified_t wmi_handle,
 		  struct extscan_bssid_hotlist_reset_params *photlist_reset);
 
-CDF_STATUS send_stop_extscan_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_stop_extscan_cmd_tlv(wmi_unified_t wmi_handle,
 			  struct extscan_stop_req_params *pstopcmd);
 
-CDF_STATUS send_start_extscan_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_start_extscan_cmd_tlv(wmi_unified_t wmi_handle,
 			  struct wifi_scan_cmd_req_params *pstart);
 
-CDF_STATUS send_plm_stop_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_plm_stop_cmd_tlv(wmi_unified_t wmi_handle,
 			  const struct plm_req_params *plm);
 
-CDF_STATUS send_plm_start_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_plm_start_cmd_tlv(wmi_unified_t wmi_handle,
 			  const struct plm_req_params *plm,
 			  uint32_t *gchannel_list);
 
-CDF_STATUS send_pno_stop_cmd_tlv(wmi_unified_t wmi_handle, uint8_t vdev_id);
+QDF_STATUS send_pno_stop_cmd_tlv(wmi_unified_t wmi_handle, uint8_t vdev_id);
 
-CDF_STATUS send_pno_start_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_pno_start_cmd_tlv(wmi_unified_t wmi_handle,
 		   struct pno_scan_req_params *pno,
 		   uint32_t *gchannel_freq_list);
 
-CDF_STATUS send_process_ll_stats_clear_cmd_tlv
+QDF_STATUS send_process_ll_stats_clear_cmd_tlv
 	(wmi_unified_t wmi_handle,
 	 const struct ll_stats_clear_params *clear_req,
 	 uint8_t addr[IEEE80211_ADDR_LEN]);
 
-CDF_STATUS send_process_ll_stats_set_cmd_tlv
+QDF_STATUS send_process_ll_stats_set_cmd_tlv
 	(wmi_unified_t wmi_handle, const struct ll_stats_set_params *set_req);
 
-CDF_STATUS send_process_ll_stats_get_cmd_tlv
+QDF_STATUS send_process_ll_stats_get_cmd_tlv
 	(wmi_unified_t wmi_handle, const struct ll_stats_get_params  *get_req,
 		 uint8_t addr[IEEE80211_ADDR_LEN]);
 
-CDF_STATUS send_get_stats_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_get_stats_cmd_tlv(wmi_unified_t wmi_handle,
 		       struct pe_stats_req  *get_stats_param,
 			   uint8_t addr[IEEE80211_ADDR_LEN]);
 
-CDF_STATUS send_snr_request_cmd_tlv(wmi_unified_t wmi_handle);
+QDF_STATUS send_snr_request_cmd_tlv(wmi_unified_t wmi_handle);
 
-CDF_STATUS send_snr_cmd_tlv(wmi_unified_t wmi_handle, uint8_t vdev_id);
+QDF_STATUS send_snr_cmd_tlv(wmi_unified_t wmi_handle, uint8_t vdev_id);
 
-CDF_STATUS send_link_status_req_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_link_status_req_cmd_tlv(wmi_unified_t wmi_handle,
 				 struct link_status_params *link_status);
 
-CDF_STATUS send_lphb_config_hbenable_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_lphb_config_hbenable_cmd_tlv(wmi_unified_t wmi_handle,
 				wmi_hb_set_enable_cmd_fixed_param *params);
 
-CDF_STATUS send_lphb_config_tcp_params_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_lphb_config_tcp_params_cmd_tlv(wmi_unified_t wmi_handle,
 				    wmi_hb_set_tcp_params_cmd_fixed_param *lphb_conf_req);
 
-CDF_STATUS send_lphb_config_tcp_pkt_filter_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_lphb_config_tcp_pkt_filter_cmd_tlv(wmi_unified_t wmi_handle,
 				wmi_hb_set_tcp_pkt_filter_cmd_fixed_param *g_hb_tcp_filter_fp);
 
-CDF_STATUS send_lphb_config_udp_params_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_lphb_config_udp_params_cmd_tlv(wmi_unified_t wmi_handle,
 				    wmi_hb_set_udp_params_cmd_fixed_param *lphb_conf_req);
 
-CDF_STATUS send_lphb_config_udp_pkt_filter_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_lphb_config_udp_pkt_filter_cmd_tlv(wmi_unified_t wmi_handle,
 					wmi_hb_set_udp_pkt_filter_cmd_fixed_param *lphb_conf_req);
 
-CDF_STATUS send_process_dhcp_ind_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_process_dhcp_ind_cmd_tlv(wmi_unified_t wmi_handle,
 				wmi_peer_set_param_cmd_fixed_param *ta_dhcp_ind);
 
-CDF_STATUS send_get_link_speed_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_get_link_speed_cmd_tlv(wmi_unified_t wmi_handle,
 			wmi_mac_addr peer_macaddr);
 
-CDF_STATUS send_egap_conf_params_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_egap_conf_params_cmd_tlv(wmi_unified_t wmi_handle,
 				     wmi_ap_ps_egap_param_cmd_fixed_param *egap_params);
 
-CDF_STATUS send_fw_profiling_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_fw_profiling_cmd_tlv(wmi_unified_t wmi_handle,
 			uint32_t cmd, uint32_t value1, uint32_t value2);
 
-CDF_STATUS send_wow_sta_ra_filter_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_wow_sta_ra_filter_cmd_tlv(wmi_unified_t wmi_handle,
 				   uint8_t vdev_id, uint8_t default_pattern,
 				   uint16_t rate_limit_interval);
 
-CDF_STATUS send_nat_keepalive_en_cmd_tlv(wmi_unified_t wmi_handle, uint8_t vdev_id);
+QDF_STATUS send_nat_keepalive_en_cmd_tlv(wmi_unified_t wmi_handle, uint8_t vdev_id);
 
-CDF_STATUS send_csa_offload_enable_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_csa_offload_enable_cmd_tlv(wmi_unified_t wmi_handle,
 			uint8_t vdev_id);
 
-CDF_STATUS send_start_oem_data_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_start_oem_data_cmd_tlv(wmi_unified_t wmi_handle,
 			  uint8_t data_len,
 			  uint8_t *data);
 
-CDF_STATUS
+QDF_STATUS
 send_dfs_phyerr_filter_offload_en_cmd_tlv(wmi_unified_t wmi_handle,
 			bool dfs_phyerr_filter_offload);
 
-CDF_STATUS send_pktlog_wmi_send_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_pktlog_wmi_send_cmd_tlv(wmi_unified_t wmi_handle,
 				   WMI_PKTLOG_EVENT pktlog_event,
 				   WMI_CMD_ID cmd_id);
 
-CDF_STATUS send_add_wow_wakeup_event_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_add_wow_wakeup_event_cmd_tlv(wmi_unified_t wmi_handle,
 					uint32_t vdev_id,
 					uint32_t bitmap,
 					bool enable);
 
-CDF_STATUS send_wow_patterns_to_fw_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_wow_patterns_to_fw_cmd_tlv(wmi_unified_t wmi_handle,
 				uint8_t vdev_id, uint8_t ptrn_id,
 				const uint8_t *ptrn, uint8_t ptrn_len,
 				uint8_t ptrn_offset, const uint8_t *mask,
 				uint8_t mask_len, bool user,
 				uint8_t default_patterns);
 
-CDF_STATUS send_wow_delete_pattern_cmd_tlv(wmi_unified_t wmi_handle, uint8_t ptrn_id,
+QDF_STATUS send_wow_delete_pattern_cmd_tlv(wmi_unified_t wmi_handle, uint8_t ptrn_id,
 					uint8_t vdev_id);
 
-CDF_STATUS send_host_wakeup_ind_to_fw_cmd_tlv(wmi_unified_t wmi_handle);
+QDF_STATUS send_host_wakeup_ind_to_fw_cmd_tlv(wmi_unified_t wmi_handle);
 
-CDF_STATUS send_del_ts_cmd_tlv(wmi_unified_t wmi_handle, uint8_t vdev_id,
+QDF_STATUS send_del_ts_cmd_tlv(wmi_unified_t wmi_handle, uint8_t vdev_id,
 				uint8_t ac);
 
-CDF_STATUS send_aggr_qos_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_aggr_qos_cmd_tlv(wmi_unified_t wmi_handle,
 		      struct aggr_add_ts_param *aggr_qos_rsp_msg);
 
-CDF_STATUS send_add_ts_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_add_ts_cmd_tlv(wmi_unified_t wmi_handle,
 		 struct add_ts_param *msg);
 
-CDF_STATUS send_enable_disable_packet_filter_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_enable_disable_packet_filter_cmd_tlv(wmi_unified_t wmi_handle,
 					uint8_t vdev_id, bool enable);
 
-CDF_STATUS send_config_packet_filter_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_config_packet_filter_cmd_tlv(wmi_unified_t wmi_handle,
 		uint8_t vdev_id, struct rcv_pkt_filter_config *rcv_filter_param,
 		uint8_t filter_id, bool enable);
 
-CDF_STATUS send_add_clear_mcbc_filter_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_add_clear_mcbc_filter_cmd_tlv(wmi_unified_t wmi_handle,
 				     uint8_t vdev_id,
-				     struct cdf_mac_addr multicast_addr,
+				     struct qdf_mac_addr multicast_addr,
 				     bool clearList);
 
-CDF_STATUS send_gtk_offload_cmd_tlv(wmi_unified_t wmi_handle, uint8_t vdev_id,
+QDF_STATUS send_gtk_offload_cmd_tlv(wmi_unified_t wmi_handle, uint8_t vdev_id,
 					   struct gtk_offload_params *params,
 					   bool enable_offload,
 					   uint32_t gtk_offload_opcode);
 
-CDF_STATUS send_process_gtk_offload_getinfo_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_process_gtk_offload_getinfo_cmd_tlv(wmi_unified_t wmi_handle,
 				uint8_t vdev_id,
 				uint64_t offload_req_opcode);
 
-CDF_STATUS send_process_add_periodic_tx_ptrn_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_process_add_periodic_tx_ptrn_cmd_tlv(wmi_unified_t wmi_handle,
 						struct periodic_tx_pattern  *
 						pAddPeriodicTxPtrnParams,
 						uint8_t vdev_id);
 
-CDF_STATUS send_process_del_periodic_tx_ptrn_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_process_del_periodic_tx_ptrn_cmd_tlv(wmi_unified_t wmi_handle,
 						uint8_t vdev_id,
 						uint8_t pattern_id);
 
-CDF_STATUS send_stats_ext_req_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_stats_ext_req_cmd_tlv(wmi_unified_t wmi_handle,
 			struct stats_ext_params *preq);
 
-CDF_STATUS send_enable_ext_wow_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_enable_ext_wow_cmd_tlv(wmi_unified_t wmi_handle,
 			struct ext_wow_params *params);
 
-CDF_STATUS send_set_app_type2_params_in_fw_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_set_app_type2_params_in_fw_cmd_tlv(wmi_unified_t wmi_handle,
 					  struct app_type2_params *appType2Params);
 
-CDF_STATUS send_set_auto_shutdown_timer_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_set_auto_shutdown_timer_cmd_tlv(wmi_unified_t wmi_handle,
 						  uint32_t timer_val);
 
-CDF_STATUS send_nan_req_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_nan_req_cmd_tlv(wmi_unified_t wmi_handle,
 			struct nan_req_params *nan_req);
 
-CDF_STATUS send_process_dhcpserver_offload_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_process_dhcpserver_offload_cmd_tlv(wmi_unified_t wmi_handle,
 				struct dhcp_offload_info_params *pDhcpSrvOffloadInfo);
 
-CDF_STATUS send_process_ch_avoid_update_cmd_tlv(wmi_unified_t wmi_handle);
+QDF_STATUS send_process_ch_avoid_update_cmd_tlv(wmi_unified_t wmi_handle);
 
-CDF_STATUS send_regdomain_info_to_fw_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_regdomain_info_to_fw_cmd_tlv(wmi_unified_t wmi_handle,
 				   uint32_t reg_dmn, uint16_t regdmn2G,
 				   uint16_t regdmn5G, int8_t ctl2G,
 				   int8_t ctl5G);
 
-CDF_STATUS send_set_tdls_offchan_mode_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_set_tdls_offchan_mode_cmd_tlv(wmi_unified_t wmi_handle,
 			      struct tdls_channel_switch_params *chan_switch_params);
 
-CDF_STATUS send_update_fw_tdls_state_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_update_fw_tdls_state_cmd_tlv(wmi_unified_t wmi_handle,
 					 void *tdls_param, uint8_t tdls_state);
 
-CDF_STATUS send_update_tdls_peer_state_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_update_tdls_peer_state_cmd_tlv(wmi_unified_t wmi_handle,
 			       struct tdls_peer_state_params *peerStateParams,
 				   uint32_t *ch_mhz);
 
 
-CDF_STATUS send_process_fw_mem_dump_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_process_fw_mem_dump_cmd_tlv(wmi_unified_t wmi_handle,
 					struct fw_dump_req_param *mem_dump_req);
 
-CDF_STATUS send_process_set_ie_info_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_process_set_ie_info_cmd_tlv(wmi_unified_t wmi_handle,
 				   struct vdev_ie_info_param *ie_info);
 
-CDF_STATUS send_init_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_init_cmd_tlv(wmi_unified_t wmi_handle,
 		wmi_resource_config *res_cfg,
 		uint8_t num_mem_chunks, struct wmi_host_mem_chunk *mem_chunk,
 		bool action);
 
-CDF_STATUS send_saved_init_cmd_tlv(wmi_unified_t wmi_handle);
+QDF_STATUS send_saved_init_cmd_tlv(wmi_unified_t wmi_handle);
 
-CDF_STATUS save_fw_version_cmd_tlv(wmi_unified_t wmi_handle, void *evt_buf);
+QDF_STATUS save_fw_version_cmd_tlv(wmi_unified_t wmi_handle, void *evt_buf);
 
-CDF_STATUS check_and_update_fw_version_cmd_tlv(wmi_unified_t wmi_hdl, void *ev);
+QDF_STATUS check_and_update_fw_version_cmd_tlv(wmi_unified_t wmi_hdl, void *ev);
 
-CDF_STATUS send_set_base_macaddr_indicate_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_set_base_macaddr_indicate_cmd_tlv(wmi_unified_t wmi_handle,
 					 uint8_t *custom_addr);
 
-CDF_STATUS send_log_supported_evt_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_log_supported_evt_cmd_tlv(wmi_unified_t wmi_handle,
 		uint8_t *event,
 		uint32_t len);
 
-CDF_STATUS send_enable_specific_fw_logs_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_enable_specific_fw_logs_cmd_tlv(wmi_unified_t wmi_handle,
 		struct wmi_wifi_start_log *start_log);
 
-CDF_STATUS send_flush_logs_to_fw_cmd_tlv(wmi_unified_t wmi_handle);
+QDF_STATUS send_flush_logs_to_fw_cmd_tlv(wmi_unified_t wmi_handle);
 
-CDF_STATUS send_soc_set_pcl_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_soc_set_pcl_cmd_tlv(wmi_unified_t wmi_handle,
 				struct wmi_pcl_list *msg);
 
-CDF_STATUS send_soc_set_hw_mode_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_soc_set_hw_mode_cmd_tlv(wmi_unified_t wmi_handle,
 				uint32_t hw_mode_index);
 
-CDF_STATUS send_soc_set_dual_mac_config_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_soc_set_dual_mac_config_cmd_tlv(wmi_unified_t wmi_handle,
 		struct wmi_dual_mac_config *msg);
 
-CDF_STATUS send_enable_arp_ns_offload_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_enable_arp_ns_offload_cmd_tlv(wmi_unified_t wmi_handle,
 			   struct host_offload_req_param *param, bool arp_only,
 			   uint8_t vdev_id);
 
-CDF_STATUS send_set_led_flashing_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_set_led_flashing_cmd_tlv(wmi_unified_t wmi_handle,
 				struct flashing_req_params *flashing);
 
-CDF_STATUS send_app_type1_params_in_fw_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_app_type1_params_in_fw_cmd_tlv(wmi_unified_t wmi_handle,
 				   struct app_type1_params *app_type1_params);
 
-CDF_STATUS
+QDF_STATUS
 send_set_ssid_hotlist_cmd_tlv(wmi_unified_t wmi_handle,
 		     struct ssid_hotlist_request_params *request);
 
-CDF_STATUS send_process_roam_synch_complete_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_process_roam_synch_complete_cmd_tlv(wmi_unified_t wmi_handle,
 		 uint8_t vdev_id);
 
-CDF_STATUS send_unit_test_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_unit_test_cmd_tlv(wmi_unified_t wmi_handle,
 			       struct wmi_unit_test_cmd *wmi_utest);
 
-CDF_STATUS send_roam_invoke_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_roam_invoke_cmd_tlv(wmi_unified_t wmi_handle,
 		struct wmi_roam_invoke_cmd *roaminvoke,
 		uint32_t ch_hz);
 
-CDF_STATUS send_roam_scan_offload_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_roam_scan_offload_cmd_tlv(wmi_unified_t wmi_handle,
 					 uint32_t command, uint32_t vdev_id);
 
-CDF_STATUS send_roam_scan_offload_ap_profile_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_roam_scan_offload_ap_profile_cmd_tlv(wmi_unified_t wmi_handle,
 					    wmi_ap_profile *ap_profile_p,
 					    uint32_t vdev_id);
 
-CDF_STATUS send_roam_scan_offload_scan_period_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_roam_scan_offload_scan_period_cmd_tlv(wmi_unified_t wmi_handle,
 					     uint32_t scan_period,
 					     uint32_t scan_age,
 					     uint32_t vdev_id);
 
-CDF_STATUS send_roam_scan_offload_chan_list_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_roam_scan_offload_chan_list_cmd_tlv(wmi_unified_t wmi_handle,
 				   uint8_t chan_count,
 				   uint8_t *chan_list,
 				   uint8_t list_type, uint32_t vdev_id);
 
-CDF_STATUS send_roam_scan_offload_rssi_change_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_roam_scan_offload_rssi_change_cmd_tlv(wmi_unified_t wmi_handle,
 	uint32_t vdev_id,
 	int32_t rssi_change_thresh,
 	uint32_t bcn_rssi_weight,
 	uint32_t hirssi_delay_btw_scans);
 
-CDF_STATUS send_get_buf_extscan_hotlist_cmd_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_get_buf_extscan_hotlist_cmd_tlv(wmi_unified_t wmi_handle,
 				   struct ext_scan_setbssi_hotlist_params *
 				   photlist, int *buf_len);
 #endif

wmi/src/wmi_tlv_helper.c

@@ -117,10 +117,10 @@ A_UINT32 wmitlv_get_attributes(A_UINT32 is_cmd_id, A_UINT32 cmd_event_id,
 
 	if (is_cmd_id) {
 		pAttrArrayList = &cmd_attr_list[0];
-		num_entries = CDF_ARRAY_SIZE(cmd_attr_list);
+		num_entries = QDF_ARRAY_SIZE(cmd_attr_list);
 	} else {
 		pAttrArrayList = &evt_attr_list[0];
-		num_entries = CDF_ARRAY_SIZE(evt_attr_list);
+		num_entries = QDF_ARRAY_SIZE(evt_attr_list);
 	}
 
 	for (i = 0; i < num_entries; i++) {

wmi/src/wmi_tlv_platform.c

@@ -30,7 +30,7 @@
  */
 
 #include "ol_if_athvar.h"
-#include <cdf_memory.h>         /* cdf_mem_malloc,free, etc. */
+#include <qdf_mem.h>         /* qdf_mem_malloc,free, etc. */
 #include <osdep.h>
 #include "htc_api.h"
 #include "wmi.h"
@@ -40,7 +40,7 @@
 /* Following macro definitions use OS or platform specific functions */
 #define dummy_print(fmt, ...) {}
 #define wmi_tlv_print_verbose dummy_print
-#define wmi_tlv_print_error   cdf_print
+#define wmi_tlv_print_error   qdf_print
 #define wmi_tlv_OS_MEMCPY     OS_MEMCPY
 #define wmi_tlv_OS_MEMZERO    OS_MEMZERO
 #define wmi_tlv_OS_MEMMOVE    OS_MEMMOVE
@@ -50,5 +50,5 @@
 	{ \
 		(ptr) = os_malloc(NULL, (numBytes), GFP_ATOMIC); \
 	}
-#define wmi_tlv_os_mem_free   cdf_mem_free
+#define wmi_tlv_os_mem_free   qdf_mem_free
 #endif

wmi/src/wmi_unified.c

@@ -40,9 +40,6 @@
 #include "dbglog_host.h"
 #include "wmi.h"
 #include "wmi_unified_priv.h"
-#include "wma_api.h"
-#include "wma.h"
-#include "mac_trace.h"
 #include "wmi_unified_param.h"
 
 #define WMI_MIN_HEAD_ROOM 64
@@ -69,9 +66,9 @@ struct wmi_event_debug wmi_rx_event_log_buffer[WMI_EVENT_DEBUG_MAX_ENTRY];
 	if (WMI_EVENT_DEBUG_MAX_ENTRY <= g_wmi_command_buf_idx)		\
 		g_wmi_command_buf_idx = 0;				\
 	wmi_command_log_buffer[g_wmi_command_buf_idx].command = a;	\
-	cdf_mem_copy(wmi_command_log_buffer[g_wmi_command_buf_idx].data, b, 16); \
+	qdf_mem_copy(wmi_command_log_buffer[g_wmi_command_buf_idx].data, b, 16); \
 	wmi_command_log_buffer[g_wmi_command_buf_idx].time =		\
-		cdf_get_log_timestamp();				\
+		qdf_get_log_timestamp();				\
 	g_wmi_command_buf_idx++;					\
 }
 
@@ -79,10 +76,10 @@ struct wmi_event_debug wmi_rx_event_log_buffer[WMI_EVENT_DEBUG_MAX_ENTRY];
 	if (WMI_EVENT_DEBUG_MAX_ENTRY <= g_wmi_command_tx_cmp_buf_idx)	\
 		g_wmi_command_tx_cmp_buf_idx = 0;			\
 	wmi_command_tx_cmp_log_buffer[g_wmi_command_tx_cmp_buf_idx].command = a; \
-	cdf_mem_copy(wmi_command_tx_cmp_log_buffer			\
+	qdf_mem_copy(wmi_command_tx_cmp_log_buffer			\
 	     [g_wmi_command_tx_cmp_buf_idx].data, b, 16);	     \
 	wmi_command_tx_cmp_log_buffer[g_wmi_command_tx_cmp_buf_idx].time = \
-		cdf_get_log_timestamp();				\
+		qdf_get_log_timestamp();				\
 	g_wmi_command_tx_cmp_buf_idx++;					\
 }
 
@@ -90,9 +87,9 @@ struct wmi_event_debug wmi_rx_event_log_buffer[WMI_EVENT_DEBUG_MAX_ENTRY];
 	if (WMI_EVENT_DEBUG_MAX_ENTRY <= g_wmi_event_buf_idx)		\
 		g_wmi_event_buf_idx = 0;				\
 	wmi_event_log_buffer[g_wmi_event_buf_idx].event = a;		\
-	cdf_mem_copy(wmi_event_log_buffer[g_wmi_event_buf_idx].data, b, 16); \
+	qdf_mem_copy(wmi_event_log_buffer[g_wmi_event_buf_idx].data, b, 16); \
 	wmi_event_log_buffer[g_wmi_event_buf_idx].time =		\
-		cdf_get_log_timestamp();				\
+		qdf_get_log_timestamp();				\
 	g_wmi_event_buf_idx++;						\
 }
 
@@ -100,9 +97,9 @@ struct wmi_event_debug wmi_rx_event_log_buffer[WMI_EVENT_DEBUG_MAX_ENTRY];
 	if (WMI_EVENT_DEBUG_MAX_ENTRY <= g_wmi_rx_event_buf_idx)	\
 		g_wmi_rx_event_buf_idx = 0;				\
 	wmi_rx_event_log_buffer[g_wmi_rx_event_buf_idx].event = a;	\
-	cdf_mem_copy(wmi_rx_event_log_buffer[g_wmi_rx_event_buf_idx].data, b, 16); \
+	qdf_mem_copy(wmi_rx_event_log_buffer[g_wmi_rx_event_buf_idx].data, b, 16); \
 	wmi_rx_event_log_buffer[g_wmi_rx_event_buf_idx].time =		\
-		cdf_get_log_timestamp();				\
+		qdf_get_log_timestamp();				\
 	g_wmi_rx_event_buf_idx++;					\
 }
 /* wmi_mgmt commands */
@@ -127,11 +124,11 @@ wmi_mgmt_event_log_buffer[WMI_MGMT_EVENT_DEBUG_MAX_ENTRY];
 		g_wmi_mgmt_command_buf_idx)				     \
 		g_wmi_mgmt_command_buf_idx = 0;				     \
 	wmi_mgmt_command_log_buffer[g_wmi_mgmt_command_buf_idx].command = a; \
-	cdf_mem_copy(							     \
+	qdf_mem_copy(							     \
 		wmi_mgmt_command_log_buffer[g_wmi_mgmt_command_buf_idx].data,\
 		b, 16);							     \
 	wmi_mgmt_command_log_buffer[g_wmi_mgmt_command_buf_idx].time =	     \
-		cdf_get_log_timestamp();				     \
+		qdf_get_log_timestamp();				     \
 	g_wmi_mgmt_command_buf_idx++;					     \
 }
 
@@ -141,11 +138,11 @@ wmi_mgmt_event_log_buffer[WMI_MGMT_EVENT_DEBUG_MAX_ENTRY];
 		g_wmi_mgmt_command_tx_cmp_buf_idx = 0;			     \
 	wmi_mgmt_command_tx_cmp_log_buffer[g_wmi_mgmt_command_tx_cmp_buf_idx].\
 								command = a; \
-	cdf_mem_copy(wmi_mgmt_command_tx_cmp_log_buffer			     \
+	qdf_mem_copy(wmi_mgmt_command_tx_cmp_log_buffer			     \
 		     [g_wmi_mgmt_command_tx_cmp_buf_idx].data, b, 16);	     \
 	wmi_mgmt_command_tx_cmp_log_buffer[g_wmi_mgmt_command_tx_cmp_buf_idx].\
 									time =\
-		cdf_get_log_timestamp();				      \
+		qdf_get_log_timestamp();				      \
 	g_wmi_mgmt_command_tx_cmp_buf_idx++;				      \
 }
 
@@ -153,10 +150,10 @@ wmi_mgmt_event_log_buffer[WMI_MGMT_EVENT_DEBUG_MAX_ENTRY];
 	if (WMI_MGMT_EVENT_DEBUG_MAX_ENTRY <= g_wmi_mgmt_event_buf_idx)       \
 		g_wmi_mgmt_event_buf_idx = 0;				      \
 	wmi_mgmt_event_log_buffer[g_wmi_mgmt_event_buf_idx].event = a;	      \
-	cdf_mem_copy(wmi_mgmt_event_log_buffer[g_wmi_mgmt_event_buf_idx].data,\
+	qdf_mem_copy(wmi_mgmt_event_log_buffer[g_wmi_mgmt_event_buf_idx].data,\
 		     b, 16);						      \
 	wmi_mgmt_event_log_buffer[g_wmi_mgmt_event_buf_idx].time =	      \
-		cdf_get_log_timestamp();				      \
+		qdf_get_log_timestamp();				      \
 	g_wmi_mgmt_event_buf_idx++;					      \
 }
 
@@ -174,11 +171,11 @@ wmi_buf_alloc_debug(wmi_unified_t wmi_handle, uint16_t len, uint8_t *file_name,
 	wmi_buf_t wmi_buf;
 
 	if (roundup(len + WMI_MIN_HEAD_ROOM, 4) > wmi_handle->max_msg_len) {
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return NULL;
 	}
 
-	wmi_buf = cdf_nbuf_alloc_debug(NULL,
+	wmi_buf = qdf_nbuf_alloc_debug(NULL,
 				       roundup(len + WMI_MIN_HEAD_ROOM, 4),
 				       WMI_MIN_HEAD_ROOM, 4, false, file_name,
 				       line_num);
@@ -187,19 +184,19 @@ wmi_buf_alloc_debug(wmi_unified_t wmi_handle, uint16_t len, uint8_t *file_name,
 		return NULL;
 
 	/* Clear the wmi buffer */
-	OS_MEMZERO(cdf_nbuf_data(wmi_buf), len);
+	OS_MEMZERO(qdf_nbuf_data(wmi_buf), len);
 
 	/*
 	 * Set the length of the buffer to match the allocation size.
 	 */
-	cdf_nbuf_set_pktlen(wmi_buf, len);
+	qdf_nbuf_set_pktlen(wmi_buf, len);
 
 	return wmi_buf;
 }
 
 void wmi_buf_free(wmi_buf_t net_buf)
 {
-	cdf_nbuf_free(net_buf);
+	qdf_nbuf_free(net_buf);
 }
 #else
 wmi_buf_t wmi_buf_alloc(wmi_unified_t wmi_handle, uint16_t len)
@@ -207,28 +204,28 @@ wmi_buf_t wmi_buf_alloc(wmi_unified_t wmi_handle, uint16_t len)
 	wmi_buf_t wmi_buf;
 
 	if (roundup(len + WMI_MIN_HEAD_ROOM, 4) > wmi_handle->max_msg_len) {
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return NULL;
 	}
 
-	wmi_buf = cdf_nbuf_alloc(NULL, roundup(len + WMI_MIN_HEAD_ROOM, 4),
+	wmi_buf = qdf_nbuf_alloc(NULL, roundup(len + WMI_MIN_HEAD_ROOM, 4),
 				WMI_MIN_HEAD_ROOM, 4, false);
 	if (!wmi_buf)
 		return NULL;
 
 	/* Clear the wmi buffer */
-	OS_MEMZERO(cdf_nbuf_data(wmi_buf), len);
+	OS_MEMZERO(qdf_nbuf_data(wmi_buf), len);
 
 	/*
 	 * Set the length of the buffer to match the allocation size.
 	 */
-	cdf_nbuf_set_pktlen(wmi_buf, len);
+	qdf_nbuf_set_pktlen(wmi_buf, len);
 	return wmi_buf;
 }
 
 void wmi_buf_free(wmi_buf_t net_buf)
 {
-	cdf_nbuf_free(net_buf);
+	qdf_nbuf_free(net_buf);
 }
 #endif
 
@@ -775,13 +772,13 @@ static uint8_t *get_wmi_cmd_string(WMI_CMD_ID wmi_command)
 #ifdef QCA_WIFI_3_0_EMU
 static inline void wma_log_cmd_id(WMI_CMD_ID cmd_id)
 {
-	WMA_LOGE("Send WMI command:%s command_id:%d",
+	WMI_LOGE("Send WMI command:%s command_id:%d",
 		 get_wmi_cmd_string(cmd_id), cmd_id);
 }
 #else
 static inline void wma_log_cmd_id(WMI_CMD_ID cmd_id)
 {
-	WMA_LOGD("Send WMI command:%s command_id:%d",
+	WMI_LOGD("Send WMI command:%s command_id:%d",
 		 get_wmi_cmd_string(cmd_id), cmd_id);
 }
 #endif
@@ -829,54 +826,54 @@ int wmi_unified_cmd_send(wmi_unified_t wmi_handle, wmi_buf_t buf, uint32_t len,
 	if (wmi_get_runtime_pm_inprogress(wmi_handle)) {
 		if (wmi_is_runtime_pm_cmd(cmd_id))
 			htc_tag = HTC_TX_PACKET_TAG_AUTO_PM;
-	} else if (cdf_atomic_read(&wmi_handle->is_target_suspended) &&
+	} else if (qdf_atomic_read(&wmi_handle->is_target_suspended) &&
 	    ((WMI_WOW_HOSTWAKEUP_FROM_SLEEP_CMDID != cmd_id) &&
 	     (WMI_PDEV_RESUME_CMDID != cmd_id))) {
-		CDF_TRACE(CDF_MODULE_ID_WMI, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_WMI, QDF_TRACE_LEVEL_ERROR,
 				  "%s: Target is suspended", __func__);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return -EBUSY;
 	}
 
 	/* Do sanity check on the TLV parameter structure */
 	{
-		void *buf_ptr = (void *)cdf_nbuf_data(buf);
+		void *buf_ptr = (void *)qdf_nbuf_data(buf);
 
 		if (wmitlv_check_command_tlv_params(NULL, buf_ptr, len, cmd_id)
 		    != 0) {
-			CDF_TRACE(CDF_MODULE_ID_WMI, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_WMI, QDF_TRACE_LEVEL_ERROR,
 			"\nERROR: %s: Invalid WMI Param Buffer for Cmd:%d",
 				__func__, cmd_id);
 			return -EINVAL;
 		}
 	}
 
-	if (cdf_nbuf_push_head(buf, sizeof(WMI_CMD_HDR)) == NULL) {
-		CDF_TRACE(CDF_MODULE_ID_WMI, CDF_TRACE_LEVEL_ERROR,
+	if (qdf_nbuf_push_head(buf, sizeof(WMI_CMD_HDR)) == NULL) {
+		QDF_TRACE(QDF_MODULE_ID_WMI, QDF_TRACE_LEVEL_ERROR,
 			 "%s, Failed to send cmd %x, no memory",
 			 __func__, cmd_id);
 		return -ENOMEM;
 	}
 
-	WMI_SET_FIELD(cdf_nbuf_data(buf), WMI_CMD_HDR, COMMANDID, cmd_id);
+	WMI_SET_FIELD(qdf_nbuf_data(buf), WMI_CMD_HDR, COMMANDID, cmd_id);
 
-	cdf_atomic_inc(&wmi_handle->pending_cmds);
-	if (cdf_atomic_read(&wmi_handle->pending_cmds) >= WMI_MAX_CMDS) {
-		CDF_TRACE(CDF_MODULE_ID_WMI, CDF_TRACE_LEVEL_ERROR,
+	qdf_atomic_inc(&wmi_handle->pending_cmds);
+	if (qdf_atomic_read(&wmi_handle->pending_cmds) >= WMI_MAX_CMDS) {
+		QDF_TRACE(QDF_MODULE_ID_WMI, QDF_TRACE_LEVEL_ERROR,
 		    "\n%s: hostcredits = %d", __func__,
 		     wmi_get_host_credits(wmi_handle));
 		htc_dump_counter_info(wmi_handle->htc_handle);
-		cdf_atomic_dec(&wmi_handle->pending_cmds);
-		CDF_TRACE(CDF_MODULE_ID_WMI, CDF_TRACE_LEVEL_ERROR,
+		qdf_atomic_dec(&wmi_handle->pending_cmds);
+		QDF_TRACE(QDF_MODULE_ID_WMI, QDF_TRACE_LEVEL_ERROR,
 		    "%s: MAX 1024 WMI Pending cmds reached.", __func__);
-		CDF_BUG(0);
+		QDF_BUG(0);
 		return -EBUSY;
 	}
 
-	pkt = cdf_mem_malloc(sizeof(*pkt));
+	pkt = qdf_mem_malloc(sizeof(*pkt));
 	if (!pkt) {
-		cdf_atomic_dec(&wmi_handle->pending_cmds);
-		CDF_TRACE(CDF_MODULE_ID_WMI, CDF_TRACE_LEVEL_ERROR,
+		qdf_atomic_dec(&wmi_handle->pending_cmds);
+		QDF_TRACE(QDF_MODULE_ID_WMI, QDF_TRACE_LEVEL_ERROR,
 			 "%s, Failed to alloc htc packet %x, no memory",
 			 __func__, cmd_id);
 		return -ENOMEM;
@@ -884,7 +881,7 @@ int wmi_unified_cmd_send(wmi_unified_t wmi_handle, wmi_buf_t buf, uint32_t len,
 
 	SET_HTC_PACKET_INFO_TX(pkt,
 			       NULL,
-			       cdf_nbuf_data(buf), len + sizeof(WMI_CMD_HDR),
+			       qdf_nbuf_data(buf), len + sizeof(WMI_CMD_HDR),
 			       wmi_handle->wmi_endpoint_id, htc_tag);
 
 	SET_HTC_PACKET_NET_BUF_CONTEXT(pkt, buf);
@@ -892,30 +889,30 @@ int wmi_unified_cmd_send(wmi_unified_t wmi_handle, wmi_buf_t buf, uint32_t len,
 	wma_log_cmd_id(cmd_id);
 
 #ifdef WMI_INTERFACE_EVENT_LOGGING
-	cdf_spin_lock_bh(&wmi_handle->wmi_record_lock);
+	qdf_spin_lock_bh(&wmi_handle->wmi_record_lock);
 	/*Record 16 bytes of WMI cmd data - exclude TLV and WMI headers */
 	if (cmd_id == WMI_MGMT_TX_SEND_CMDID) {
 		WMI_MGMT_COMMAND_RECORD(cmd_id,
-					((uint32_t *)cdf_nbuf_data(buf) + 2));
+					((uint32_t *)qdf_nbuf_data(buf) + 2));
 	} else {
-		WMI_COMMAND_RECORD(cmd_id, ((uint32_t *) cdf_nbuf_data(buf) +
+		WMI_COMMAND_RECORD(cmd_id, ((uint32_t *) qdf_nbuf_data(buf) +
 					    2));
 	}
 
-	cdf_spin_unlock_bh(&wmi_handle->wmi_record_lock);
+	qdf_spin_unlock_bh(&wmi_handle->wmi_record_lock);
 #endif
 
 	status = htc_send_pkt(wmi_handle->htc_handle, pkt);
 
 	if (A_OK != status) {
-		cdf_atomic_dec(&wmi_handle->pending_cmds);
-		CDF_TRACE(CDF_MODULE_ID_WMI, CDF_TRACE_LEVEL_ERROR,
+		qdf_atomic_dec(&wmi_handle->pending_cmds);
+		QDF_TRACE(QDF_MODULE_ID_WMI, QDF_TRACE_LEVEL_ERROR,
 		   "%s %d, htc_send_pkt failed", __func__, __LINE__);
 	}
 	if (status)
-		return CDF_STATUS_E_FAILURE;
+		return QDF_STATUS_E_FAILURE;
 
-	return CDF_STATUS_SUCCESS;
+	return QDF_STATUS_SUCCESS;
 }
 
 /**
@@ -958,14 +955,14 @@ int wmi_unified_register_event_handler(wmi_unified_t wmi_handle,
 	uint32_t idx = 0;
 
 	if (wmi_unified_get_event_handler_ix(wmi_handle, event_id) != -1) {
-		cdf_print("%s : event handler already registered 0x%x \n",
+		qdf_print("%s : event handler already registered 0x%x \n",
 		       __func__, event_id);
-		return CDF_STATUS_E_FAILURE;
+		return QDF_STATUS_E_FAILURE;
 	}
 	if (wmi_handle->max_event_idx == WMI_UNIFIED_MAX_EVENT) {
-		cdf_print("%s : no more event handlers 0x%x \n",
+		qdf_print("%s : no more event handlers 0x%x \n",
 		       __func__, event_id);
-		return CDF_STATUS_E_FAILURE;
+		return QDF_STATUS_E_FAILURE;
 	}
 	idx = wmi_handle->max_event_idx;
 	wmi_handle->event_handler[idx] = handler_func;
@@ -990,9 +987,9 @@ int wmi_unified_unregister_event_handler(wmi_unified_t wmi_handle,
 
 	idx = wmi_unified_get_event_handler_ix(wmi_handle, event_id);
 	if (idx == -1) {
-		cdf_print("%s : event handler is not registered: event id 0x%x \n",
+		qdf_print("%s : event handler is not registered: event id 0x%x \n",
 		       __func__, event_id);
-		return CDF_STATUS_E_FAILURE;
+		return QDF_STATUS_E_FAILURE;
 	}
 	wmi_handle->event_handler[idx] = NULL;
 	wmi_handle->event_id[idx] = 0;
@@ -1046,16 +1043,16 @@ static void wmi_process_fw_event_worker_thread_ctx
 	uint8_t *data;
 
 	evt_buf = (wmi_buf_t) htc_packet->pPktContext;
-	id = WMI_GET_FIELD(cdf_nbuf_data(evt_buf), WMI_CMD_HDR, COMMANDID);
-	data = cdf_nbuf_data(evt_buf);
+	id = WMI_GET_FIELD(qdf_nbuf_data(evt_buf), WMI_CMD_HDR, COMMANDID);
+	data = qdf_nbuf_data(evt_buf);
 
-	cdf_spin_lock_bh(&wmi_handle->wmi_record_lock);
+	qdf_spin_lock_bh(&wmi_handle->wmi_record_lock);
 	/* Exclude 4 bytes of TLV header */
 	WMI_RX_EVENT_RECORD(id, ((uint8_t *) data + 4));
-	cdf_spin_unlock_bh(&wmi_handle->wmi_record_lock);
-	cdf_spin_lock_bh(&wmi_handle->eventq_lock);
-	cdf_nbuf_queue_add(&wmi_handle->event_queue, evt_buf);
-	cdf_spin_unlock_bh(&wmi_handle->eventq_lock);
+	qdf_spin_unlock_bh(&wmi_handle->wmi_record_lock);
+	qdf_spin_lock_bh(&wmi_handle->eventq_lock);
+	qdf_nbuf_queue_add(&wmi_handle->event_queue, evt_buf);
+	qdf_spin_unlock_bh(&wmi_handle->eventq_lock);
 	schedule_work(&wmi_handle->rx_event_work);
 	return;
 }
@@ -1076,13 +1073,13 @@ void wmi_control_rx(void *ctx, HTC_PACKET *htc_packet)
 	enum wmi_rx_exec_ctx exec_ctx;
 
 	evt_buf = (wmi_buf_t) htc_packet->pPktContext;
-	id = WMI_GET_FIELD(cdf_nbuf_data(evt_buf), WMI_CMD_HDR, COMMANDID);
+	id = WMI_GET_FIELD(qdf_nbuf_data(evt_buf), WMI_CMD_HDR, COMMANDID);
 	idx = wmi_unified_get_event_handler_ix(wmi_handle, id);
-	if (cdf_unlikely(idx == A_ERROR)) {
-		cdf_print
+	if (qdf_unlikely(idx == A_ERROR)) {
+		qdf_print
 		("%s :event handler is not registered: event id 0x%x\n",
 			__func__, id);
-		cdf_nbuf_free(evt_buf);
+		qdf_nbuf_free(evt_buf);
 		return;
 	}
 	exec_ctx = wmi_handle->ctx[idx];
@@ -1094,8 +1091,8 @@ void wmi_control_rx(void *ctx, HTC_PACKET *htc_packet)
 		wmi_process_fw_event_default_ctx
 					(wmi_handle, htc_packet, exec_ctx);
 	} else {
-		cdf_print("%s :Invalid event context %d\n", __func__, exec_ctx);
-		cdf_nbuf_free(evt_buf);
+		qdf_print("%s :Invalid event context %d\n", __func__, exec_ctx);
+		qdf_nbuf_free(evt_buf);
 	}
 
 }
@@ -1130,20 +1127,20 @@ void __wmi_control_rx(struct wmi_unified *wmi_handle, wmi_buf_t evt_buf)
 	int tlv_ok_status = 0;
 	uint32_t idx = 0;
 
-	id = WMI_GET_FIELD(cdf_nbuf_data(evt_buf), WMI_CMD_HDR, COMMANDID);
+	id = WMI_GET_FIELD(qdf_nbuf_data(evt_buf), WMI_CMD_HDR, COMMANDID);
 
-	if (cdf_nbuf_pull_head(evt_buf, sizeof(WMI_CMD_HDR)) == NULL)
+	if (qdf_nbuf_pull_head(evt_buf, sizeof(WMI_CMD_HDR)) == NULL)
 		goto end;
 
-	data = cdf_nbuf_data(evt_buf);
-	len = cdf_nbuf_len(evt_buf);
+	data = qdf_nbuf_data(evt_buf);
+	len = qdf_nbuf_len(evt_buf);
 
 	/* Validate and pad(if necessary) the TLVs */
 	tlv_ok_status = wmitlv_check_and_pad_event_tlvs(wmi_handle->scn_handle,
 							data, len, id,
 							&wmi_cmd_struct_ptr);
 	if (tlv_ok_status != 0) {
-		CDF_TRACE(CDF_MODULE_ID_WMI, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_WMI, QDF_TRACE_LEVEL_ERROR,
 			"%s: Error: id=0x%d, wmitlv check status=%d\n",
 		       __func__, id, tlv_ok_status);
 		goto end;
@@ -1151,20 +1148,20 @@ void __wmi_control_rx(struct wmi_unified *wmi_handle, wmi_buf_t evt_buf)
 
 	idx = wmi_unified_get_event_handler_ix(wmi_handle, id);
 	if (idx == A_ERROR) {
-		CDF_TRACE(CDF_MODULE_ID_WMI, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_WMI, QDF_TRACE_LEVEL_ERROR,
 		   "%s : event handler is not registered: event id 0x%x\n",
 			__func__, id);
 		goto end;
 	}
 #ifdef WMI_INTERFACE_EVENT_LOGGING
-	cdf_spin_lock_bh(&wmi_handle->wmi_record_lock);
+	qdf_spin_lock_bh(&wmi_handle->wmi_record_lock);
 	/* Exclude 4 bytes of TLV header */
 	if (id == WMI_MGMT_TX_COMPLETION_EVENTID) {
 		WMI_MGMT_EVENT_RECORD(id, ((uint8_t *) data + 4));
 	} else {
 		WMI_EVENT_RECORD(id, ((uint8_t *) data + 4));
 	}
-	cdf_spin_unlock_bh(&wmi_handle->wmi_record_lock);
+	qdf_spin_unlock_bh(&wmi_handle->wmi_record_lock);
 #endif
 	/* Call the WMI registered event handler */
 	wmi_handle->event_handler[idx] (wmi_handle->scn_handle,
@@ -1173,7 +1170,7 @@ void __wmi_control_rx(struct wmi_unified *wmi_handle, wmi_buf_t evt_buf)
 end:
 	/* Free event buffer and allocated event tlv */
 	wmitlv_free_allocated_event_tlvs(id, &wmi_cmd_struct_ptr);
-	cdf_nbuf_free(evt_buf);
+	qdf_nbuf_free(evt_buf);
 
 }
 
@@ -1191,14 +1188,14 @@ void wmi_rx_event_work(struct work_struct *work)
 					       rx_event_work);
 	wmi_buf_t buf;
 
-	cdf_spin_lock_bh(&wmi->eventq_lock);
-	buf = cdf_nbuf_queue_remove(&wmi->event_queue);
-	cdf_spin_unlock_bh(&wmi->eventq_lock);
+	qdf_spin_lock_bh(&wmi->eventq_lock);
+	buf = qdf_nbuf_queue_remove(&wmi->event_queue);
+	qdf_spin_unlock_bh(&wmi->eventq_lock);
 	while (buf) {
 		__wmi_control_rx(wmi, buf);
-		cdf_spin_lock_bh(&wmi->eventq_lock);
-		buf = cdf_nbuf_queue_remove(&wmi->event_queue);
-		cdf_spin_unlock_bh(&wmi->eventq_lock);
+		qdf_spin_lock_bh(&wmi->eventq_lock);
+		buf = qdf_nbuf_queue_remove(&wmi->event_queue);
+		qdf_spin_unlock_bh(&wmi->eventq_lock);
 	}
 }
 
@@ -1209,7 +1206,7 @@ void wmi_rx_event_work(struct work_struct *work)
  */
 static void wmi_runtime_pm_init(struct wmi_unified *wmi_handle)
 {
-	cdf_atomic_init(&wmi_handle->runtime_pm_inprogress);
+	qdf_atomic_init(&wmi_handle->runtime_pm_inprogress);
 }
 
 /**
@@ -1219,7 +1216,7 @@ static void wmi_runtime_pm_init(struct wmi_unified *wmi_handle)
  */
 void wmi_set_runtime_pm_inprogress(wmi_unified_t wmi_handle, A_BOOL val)
 {
-	cdf_atomic_set(&wmi_handle->runtime_pm_inprogress, val);
+	qdf_atomic_set(&wmi_handle->runtime_pm_inprogress, val);
 }
 
 /**
@@ -1228,7 +1225,7 @@ void wmi_set_runtime_pm_inprogress(wmi_unified_t wmi_handle, A_BOOL val)
  */
 inline bool wmi_get_runtime_pm_inprogress(wmi_unified_t wmi_handle)
 {
-	return cdf_atomic_read(&wmi_handle->runtime_pm_inprogress);
+	return qdf_atomic_read(&wmi_handle->runtime_pm_inprogress);
 }
 #else
 static void wmi_runtime_pm_init(struct wmi_unified *wmi_handle)
@@ -1256,24 +1253,24 @@ void *wmi_unified_attach(void *scn_handle,
 				sizeof(struct wmi_unified),
 				GFP_ATOMIC);
 	if (wmi_handle == NULL) {
-		cdf_print("allocation of wmi handle failed %zu\n",
+		qdf_print("allocation of wmi handle failed %zu\n",
 			sizeof(struct wmi_unified));
 		return NULL;
 	}
 	OS_MEMZERO(wmi_handle, sizeof(struct wmi_unified));
 	wmi_handle->scn_handle = (ol_scn_t *)scn_handle;
-	cdf_atomic_init(&wmi_handle->pending_cmds);
-	cdf_atomic_init(&wmi_handle->is_target_suspended);
+	qdf_atomic_init(&wmi_handle->pending_cmds);
+	qdf_atomic_init(&wmi_handle->is_target_suspended);
 	wmi_runtime_pm_init(wmi_handle);
-	cdf_spinlock_init(&wmi_handle->eventq_lock);
-	cdf_nbuf_queue_init(&wmi_handle->event_queue);
+	qdf_spinlock_create(&wmi_handle->eventq_lock);
+	qdf_nbuf_queue_init(&wmi_handle->event_queue);
 #ifdef CONFIG_CNSS
 	cnss_init_work(&wmi_handle->rx_event_work, wmi_rx_event_work);
 #else
 	INIT_WORK(&wmi_handle->rx_event_work, wmi_rx_event_work);
 #endif
 #ifdef WMI_INTERFACE_EVENT_LOGGING
-	cdf_spinlock_init(&wmi_handle->wmi_record_lock);
+	qdf_spinlock_create(&wmi_handle->wmi_record_lock);
 #endif
 	/* Attach mc_thread context processing function */
 	wmi_handle->rx_ops.wma_process_fw_event_handler_cbk =
@@ -1300,14 +1297,14 @@ void wmi_unified_detach(struct wmi_unified *wmi_handle)
 {
 	wmi_buf_t buf;
 
-	cds_flush_work(&wmi_handle->rx_event_work);
-	cdf_spin_lock_bh(&wmi_handle->eventq_lock);
-	buf = cdf_nbuf_queue_remove(&wmi_handle->event_queue);
+	cancel_work_sync(&wmi_handle->rx_event_work);
+	qdf_spin_lock_bh(&wmi_handle->eventq_lock);
+	buf = qdf_nbuf_queue_remove(&wmi_handle->event_queue);
 	while (buf) {
-		cdf_nbuf_free(buf);
-		buf = cdf_nbuf_queue_remove(&wmi_handle->event_queue);
+		qdf_nbuf_free(buf);
+		buf = qdf_nbuf_queue_remove(&wmi_handle->event_queue);
 	}
-	cdf_spin_unlock_bh(&wmi_handle->eventq_lock);
+	qdf_spin_unlock_bh(&wmi_handle->eventq_lock);
 	if (wmi_handle != NULL) {
 		OS_FREE(wmi_handle);
 		wmi_handle = NULL;
@@ -1330,17 +1327,17 @@ wmi_unified_remove_work(struct wmi_unified *wmi_handle)
 {
 	wmi_buf_t buf;
 
-	CDF_TRACE(CDF_MODULE_ID_WMI, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_WMI, QDF_TRACE_LEVEL_INFO,
 		"Enter: %s", __func__);
-	cds_flush_work(&wmi_handle->rx_event_work);
-	cdf_spin_lock_bh(&wmi_handle->eventq_lock);
-	buf = cdf_nbuf_queue_remove(&wmi_handle->event_queue);
+	cancel_work_sync(&wmi_handle->rx_event_work);
+	qdf_spin_lock_bh(&wmi_handle->eventq_lock);
+	buf = qdf_nbuf_queue_remove(&wmi_handle->event_queue);
 	while (buf) {
-		cdf_nbuf_free(buf);
-		buf = cdf_nbuf_queue_remove(&wmi_handle->event_queue);
+		qdf_nbuf_free(buf);
+		buf = qdf_nbuf_queue_remove(&wmi_handle->event_queue);
 	}
-	cdf_spin_unlock_bh(&wmi_handle->eventq_lock);
-	CDF_TRACE(CDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_INFO,
+	qdf_spin_unlock_bh(&wmi_handle->eventq_lock);
+	QDF_TRACE(QDF_MODULE_ID_WMI, QDF_TRACE_LEVEL_INFO,
 		"Done: %s", __func__);
 }
 
@@ -1354,31 +1351,31 @@ void wmi_htc_tx_complete(void *ctx, HTC_PACKET *htc_pkt)
 
 	ASSERT(wmi_cmd_buf);
 #ifdef WMI_INTERFACE_EVENT_LOGGING
-	cmd_id = WMI_GET_FIELD(cdf_nbuf_data(wmi_cmd_buf),
+	cmd_id = WMI_GET_FIELD(qdf_nbuf_data(wmi_cmd_buf),
 			       WMI_CMD_HDR, COMMANDID);
 
 #ifdef QCA_WIFI_3_0_EMU
-	cdf_print
+	qdf_print
 		("\nSent WMI command:%s command_id:0x%x over dma and recieved tx complete interupt\n",
 		 get_wmi_cmd_string(cmd_id), cmd_id);
 #endif
 
-	cdf_spin_lock_bh(&wmi_handle->wmi_record_lock);
+	qdf_spin_lock_bh(&wmi_handle->wmi_record_lock);
 	/* Record 16 bytes of WMI cmd tx complete data
 	   - exclude TLV and WMI headers */
 	if (cmd_id == WMI_MGMT_TX_SEND_CMDID) {
 		WMI_MGMT_COMMAND_TX_CMP_RECORD(cmd_id,
-				((uint32_t *) cdf_nbuf_data(wmi_cmd_buf) + 2));
+				((uint32_t *) qdf_nbuf_data(wmi_cmd_buf) + 2));
 	} else {
 		WMI_COMMAND_TX_CMP_RECORD(cmd_id,
-				((uint32_t *) cdf_nbuf_data(wmi_cmd_buf) + 2));
+				((uint32_t *) qdf_nbuf_data(wmi_cmd_buf) + 2));
 	}
 
-	cdf_spin_unlock_bh(&wmi_handle->wmi_record_lock);
+	qdf_spin_unlock_bh(&wmi_handle->wmi_record_lock);
 #endif
-	cdf_nbuf_free(wmi_cmd_buf);
-	cdf_mem_free(htc_pkt);
-	cdf_atomic_dec(&wmi_handle->pending_cmds);
+	qdf_nbuf_free(wmi_cmd_buf);
+	qdf_mem_free(htc_pkt);
+	qdf_atomic_dec(&wmi_handle->pending_cmds);
 }
 
 /**
@@ -1419,7 +1416,7 @@ wmi_unified_connect_htc_service(struct wmi_unified *wmi_handle,
 				&response);
 
 	if (status != EOK) {
-		cdf_print
+		qdf_print
 			("Failed to connect to WMI CONTROL service status:%d \n",
 			status);
 		return status;
@@ -1456,7 +1453,7 @@ int wmi_get_host_credits(wmi_unified_t wmi_handle)
  */
 int wmi_get_pending_cmds(wmi_unified_t wmi_handle)
 {
-	return cdf_atomic_read(&wmi_handle->pending_cmds);
+	return qdf_atomic_read(&wmi_handle->pending_cmds);
 }
 
 /**
@@ -1469,6 +1466,6 @@ int wmi_get_pending_cmds(wmi_unified_t wmi_handle)
  */
 void wmi_set_target_suspend(wmi_unified_t wmi_handle, A_BOOL val)
 {
-	cdf_atomic_set(&wmi_handle->is_target_suspended, val);
+	qdf_atomic_set(&wmi_handle->is_target_suspended, val);
 }
 

wmi/src/wmi_unified_non_tlv.c

@@ -38,7 +38,7 @@
  *
  * Return: 0 for success or error code
  */
-CDF_STATUS send_vdev_create_cmd_non_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_vdev_create_cmd_non_tlv(wmi_unified_t wmi_handle,
 				 uint8_t macaddr[IEEE80211_ADDR_LEN],
 				 struct vdev_create_params *param)
 {
@@ -52,7 +52,7 @@ CDF_STATUS send_vdev_create_cmd_non_tlv(wmi_unified_t wmi_handle,
  *
  * Return: 0 for success or error code
  */
-CDF_STATUS send_vdev_delete_cmd_non_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_vdev_delete_cmd_non_tlv(wmi_unified_t wmi_handle,
 					  uint8_t if_id)
 {
 	return 0;
@@ -65,7 +65,7 @@ CDF_STATUS send_vdev_delete_cmd_non_tlv(wmi_unified_t wmi_handle,
  *
  * Return: 0 for success or erro code
  */
-CDF_STATUS send_vdev_stop_cmd_non_tlv(wmi_unified_t wmi,
+QDF_STATUS send_vdev_stop_cmd_non_tlv(wmi_unified_t wmi,
 					uint8_t vdev_id)
 {
 	return 0;
@@ -78,7 +78,7 @@ CDF_STATUS send_vdev_stop_cmd_non_tlv(wmi_unified_t wmi,
  *
  * Return: 0 for success or error code
  */
-CDF_STATUS send_vdev_down_cmd_non_tlv(wmi_unified_t wmi, uint8_t vdev_id)
+QDF_STATUS send_vdev_down_cmd_non_tlv(wmi_unified_t wmi, uint8_t vdev_id)
 {
 	return 0;
 }
@@ -91,7 +91,7 @@ CDF_STATUS send_vdev_down_cmd_non_tlv(wmi_unified_t wmi, uint8_t vdev_id)
  *
  * Return: 0 for sucess or error code
  */
-CDF_STATUS send_peer_flush_tids_cmd_non_tlv(wmi_unified_t wmi,
+QDF_STATUS send_peer_flush_tids_cmd_non_tlv(wmi_unified_t wmi,
 					 uint8_t peer_addr[IEEE80211_ADDR_LEN],
 					 struct peer_flush_params *param)
 {
@@ -106,7 +106,7 @@ CDF_STATUS send_peer_flush_tids_cmd_non_tlv(wmi_unified_t wmi,
  *
  * Return: 0 for success or error code
  */
-CDF_STATUS send_peer_delete_cmd_non_tlv(wmi_unified_t wmi,
+QDF_STATUS send_peer_delete_cmd_non_tlv(wmi_unified_t wmi,
 					    uint8_t
 					    peer_addr[IEEE80211_ADDR_LEN],
 					    uint8_t vdev_id)
@@ -122,7 +122,7 @@ CDF_STATUS send_peer_delete_cmd_non_tlv(wmi_unified_t wmi,
  *
  * Return: 0 for success or error code
  */
-CDF_STATUS send_peer_param_cmd_non_tlv(wmi_unified_t wmi,
+QDF_STATUS send_peer_param_cmd_non_tlv(wmi_unified_t wmi,
 				uint8_t peer_addr[IEEE80211_ADDR_LEN],
 				struct peer_set_params *param)
 {
@@ -137,7 +137,7 @@ CDF_STATUS send_peer_param_cmd_non_tlv(wmi_unified_t wmi,
  *
  * Return: 0 for success or error code
  */
-CDF_STATUS send_vdev_up_cmd_non_tlv(wmi_unified_t wmi,
+QDF_STATUS send_vdev_up_cmd_non_tlv(wmi_unified_t wmi,
 			     uint8_t bssid[IEEE80211_ADDR_LEN],
 				 struct vdev_up_params *params)
 {
@@ -153,7 +153,7 @@ CDF_STATUS send_vdev_up_cmd_non_tlv(wmi_unified_t wmi,
  *
  * Return: 0 for success or error code
  */
-CDF_STATUS send_peer_create_cmd_non_tlv(wmi_unified_t wmi,
+QDF_STATUS send_peer_create_cmd_non_tlv(wmi_unified_t wmi,
 					struct peer_create_params *param)
 {
 	return 0;
@@ -167,7 +167,7 @@ CDF_STATUS send_peer_create_cmd_non_tlv(wmi_unified_t wmi,
  *
  * Return: 0 for success or error code
  */
-CDF_STATUS send_green_ap_ps_cmd_non_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_green_ap_ps_cmd_non_tlv(wmi_unified_t wmi_handle,
 						uint32_t value, uint8_t mac_id)
 {
 	return 0;
@@ -181,7 +181,7 @@ CDF_STATUS send_green_ap_ps_cmd_non_tlv(wmi_unified_t wmi_handle,
  *
  * Return: 0 for success or error code
  */
-CDF_STATUS
+QDF_STATUS
 send_pdev_utf_cmd_non_tlv(wmi_unified_t wmi_handle,
 				struct pdev_utf_params *param,
 				uint8_t mac_id)
@@ -197,7 +197,7 @@ send_pdev_utf_cmd_non_tlv(wmi_unified_t wmi_handle,
  *
  * Return: 0 on success, errno on failure
  */
-CDF_STATUS
+QDF_STATUS
 send_pdev_param_cmd_non_tlv(wmi_unified_t wmi_handle,
 			   struct pdev_params *param,
 				uint8_t mac_id)
@@ -213,7 +213,7 @@ send_pdev_param_cmd_non_tlv(wmi_unified_t wmi_handle,
  *
  *  Return: 0  on success and -ve on failure.
  */
-CDF_STATUS send_suspend_cmd_non_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_suspend_cmd_non_tlv(wmi_unified_t wmi_handle,
 				struct suspend_params *param,
 				uint8_t mac_id)
 {
@@ -228,7 +228,7 @@ CDF_STATUS send_suspend_cmd_non_tlv(wmi_unified_t wmi_handle,
  *
  *  Return: 0  on success and -ve on failure.
  */
-CDF_STATUS send_resume_cmd_non_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_resume_cmd_non_tlv(wmi_unified_t wmi_handle,
 				uint8_t mac_id)
 {
 	return 0;
@@ -242,7 +242,7 @@ CDF_STATUS send_resume_cmd_non_tlv(wmi_unified_t wmi_handle,
  *
  *  Return: 0  on success and -ve on failure.
  */
-CDF_STATUS send_wow_enable_cmd_non_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_wow_enable_cmd_non_tlv(wmi_unified_t wmi_handle,
 				struct wow_cmd_params *param,
 				uint8_t mac_id)
 {
@@ -257,7 +257,7 @@ CDF_STATUS send_wow_enable_cmd_non_tlv(wmi_unified_t wmi_handle,
  *
  *  Return: 0 for success or error code
  */
-CDF_STATUS send_set_ap_ps_param_cmd_non_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_set_ap_ps_param_cmd_non_tlv(wmi_unified_t wmi_handle,
 					   uint8_t *peer_addr,
 					   struct ap_ps_params *param)
 {
@@ -272,7 +272,7 @@ CDF_STATUS send_set_ap_ps_param_cmd_non_tlv(wmi_unified_t wmi_handle,
  *
  *  Return: 0 for success or error code
  */
-CDF_STATUS send_set_sta_ps_param_cmd_non_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_set_sta_ps_param_cmd_non_tlv(wmi_unified_t wmi_handle,
 					   struct sta_ps_params *param)
 {
 	return 0;
@@ -285,7 +285,7 @@ CDF_STATUS send_set_sta_ps_param_cmd_non_tlv(wmi_unified_t wmi_handle,
  *
  *  Return: 0 for success or return error
  */
-CDF_STATUS send_crash_inject_cmd_non_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_crash_inject_cmd_non_tlv(wmi_unified_t wmi_handle,
 			 struct crash_inject *param)
 {
 	return 0;
@@ -298,7 +298,7 @@ CDF_STATUS send_crash_inject_cmd_non_tlv(wmi_unified_t wmi_handle,
  *
  *  Return: 0  on success and -ve on failure.
  */
-CDF_STATUS
+QDF_STATUS
 send_dbglog_cmd_non_tlv(wmi_unified_t wmi_handle,
 				struct dbglog_params *dbglog_param)
 {
@@ -313,7 +313,7 @@ send_dbglog_cmd_non_tlv(wmi_unified_t wmi_handle,
  *
  *  Return: 0  on success and -ve on failure.
  */
-CDF_STATUS send_vdev_set_param_cmd_non_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_vdev_set_param_cmd_non_tlv(wmi_unified_t wmi_handle,
 				struct vdev_set_params *param)
 {
 	return 0;
@@ -327,7 +327,7 @@ CDF_STATUS send_vdev_set_param_cmd_non_tlv(wmi_unified_t wmi_handle,
  *
  *  Return: 0  on success and -ve on failure.
  */
-CDF_STATUS send_stats_request_cmd_non_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_stats_request_cmd_non_tlv(wmi_unified_t wmi_handle,
 				uint8_t macaddr[IEEE80211_ADDR_LEN],
 				struct stats_request_params *param)
 {
@@ -342,7 +342,7 @@ CDF_STATUS send_stats_request_cmd_non_tlv(wmi_unified_t wmi_handle,
  *
  *  Return: 0  on success and -ve on failure.
  */
-CDF_STATUS send_packet_log_enable_cmd_non_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_packet_log_enable_cmd_non_tlv(wmi_unified_t wmi_handle,
 				uint8_t macaddr[IEEE80211_ADDR_LEN],
 				struct packet_enable_params *param)
 {
@@ -357,7 +357,7 @@ CDF_STATUS send_packet_log_enable_cmd_non_tlv(wmi_unified_t wmi_handle,
  *
  *  Return: 0  on success and -ve on failure.
  */
-CDF_STATUS send_beacon_send_cmd_non_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_beacon_send_cmd_non_tlv(wmi_unified_t wmi_handle,
 				struct beacon_params *param)
 {
 	return 0;
@@ -371,7 +371,7 @@ CDF_STATUS send_beacon_send_cmd_non_tlv(wmi_unified_t wmi_handle,
  *
  *  Return: 0  on success and -ve on failure.
  */
-CDF_STATUS send_peer_assoc_cmd_non_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_peer_assoc_cmd_non_tlv(wmi_unified_t wmi_handle,
 				struct peer_assoc_params *param)
 {
 	return 0;
@@ -385,7 +385,7 @@ CDF_STATUS send_peer_assoc_cmd_non_tlv(wmi_unified_t wmi_handle,
  *
  *  Return: 0  on success and -ve on failure.
  */
-CDF_STATUS send_scan_start_cmd_non_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_scan_start_cmd_non_tlv(wmi_unified_t wmi_handle,
 				struct scan_start_params *param)
 {
 	return 0;
@@ -399,7 +399,7 @@ CDF_STATUS send_scan_start_cmd_non_tlv(wmi_unified_t wmi_handle,
  *
  *  Return: 0  on success and -ve on failure.
  */
-CDF_STATUS send_scan_stop_cmd_non_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_scan_stop_cmd_non_tlv(wmi_unified_t wmi_handle,
 				struct scan_stop_params *param)
 {
 	return 0;
@@ -413,7 +413,7 @@ CDF_STATUS send_scan_stop_cmd_non_tlv(wmi_unified_t wmi_handle,
  *
  *  Return: 0  on success and -ve on failure.
  */
-CDF_STATUS send_scan_chan_list_cmd_non_tlv(wmi_unified_t wmi_handle,
+QDF_STATUS send_scan_chan_list_cmd_non_tlv(wmi_unified_t wmi_handle,
 				struct scan_chan_list_params *param)
 {
 	return 0;