diff --git a/wmi_unified_api.h b/wmi_unified_api.h index 7082ed1cde..0e41248b60 100644 --- a/wmi_unified_api.h +++ b/wmi_unified_api.h @@ -349,7 +349,7 @@ QDF_STATUS wmi_unified_wow_enable_send(void *wmi_hdl, struct wow_cmd_params *param, uint8_t mac_id); -#ifdef WMI_NON_TLV_SUPPORT +#ifndef CONFIG_MCL QDF_STATUS wmi_unified_packet_log_enable_send(void *wmi_hdl, WMI_HOST_PKTLOG_EVENT PKTLOG_EVENT); #else @@ -471,7 +471,7 @@ QDF_STATUS wmi_unified_set_enable_disable_mcc_adaptive_scheduler_cmd( void *wmi_hdl, uint32_t mcc_adaptive_scheduler, uint32_t pdev_id); -#ifndef WMI_NON_TLV_SUPPORT +#ifdef CONFIG_MCL QDF_STATUS wmi_unified_bcn_buf_ll_cmd(void *wmi_hdl, wmi_bcn_send_from_host_cmd_fixed_param *param); #endif @@ -487,7 +487,7 @@ QDF_STATUS wmi_unified_set_sta_keep_alive_cmd(void *wmi_hdl, QDF_STATUS wmi_unified_vdev_set_gtx_cfg_cmd(void *wmi_hdl, uint32_t if_id, struct wmi_gtx_config *gtx_info); -#ifndef WMI_NON_TLV_SUPPORT +#ifdef CONFIG_MCL QDF_STATUS wmi_unified_process_update_edca_param(void *wmi_hdl, uint8_t vdev_id, wmi_wmm_vparams gwmm_param[WMI_MAX_NUM_AC]); @@ -521,7 +521,7 @@ QDF_STATUS wmi_unified_reset_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); -#ifndef WMI_NON_TLV_SUPPORT +#ifdef CONFIG_MCL QDF_STATUS wmi_unified_roam_scan_offload_mode_cmd(void *wmi_hdl, wmi_start_scan_cmd_fixed_param *scan_cmd_fp, struct roam_offload_scan_params *roam_req); @@ -603,7 +603,7 @@ QDF_STATUS wmi_unified_snr_cmd(void *wmi_hdl, uint8_t vdev_id); QDF_STATUS wmi_unified_link_status_req_cmd(void *wmi_hdl, struct link_status_params *link_status); -#ifndef WMI_NON_TLV_SUPPORT +#ifdef CONFIG_MCL QDF_STATUS wmi_unified_lphb_config_hbenable_cmd(void *wmi_hdl, wmi_hb_set_enable_cmd_fixed_param *params); @@ -647,7 +647,7 @@ QDF_STATUS wmi_unified_start_oem_data_cmd(void *wmi_hdl, QDF_STATUS wmi_unified_dfs_phyerr_filter_offload_en_cmd(void *wmi_hdl, bool dfs_phyerr_filter_offload); -#ifndef WMI_NON_TLV_SUPPORT +#ifdef CONFIG_MCL QDF_STATUS wmi_unified_pktlog_wmi_send_cmd(void *wmi_hdl, WMI_PKTLOG_EVENT pktlog_event, uint32_t cmd_id, @@ -821,7 +821,7 @@ QDF_STATUS wmi_unified_roam_invoke_cmd(void *wmi_hdl, QDF_STATUS wmi_unified_roam_scan_offload_cmd(void *wmi_hdl, uint32_t command, uint32_t vdev_id); -#ifndef WMI_NON_TLV_SUPPORT +#ifdef CONFIG_MCL QDF_STATUS wmi_unified_send_roam_scan_offload_ap_cmd(void *wmi_hdl, wmi_ap_profile *ap_profile_p, uint32_t vdev_id); diff --git a/wmi_unified_param.h b/wmi_unified_param.h index 54d3f8d3e0..5f106114b4 100644 --- a/wmi_unified_param.h +++ b/wmi_unified_param.h @@ -457,7 +457,7 @@ struct vdev_start_params { uint32_t num_noa_descriptors; uint32_t preferred_rx_streams; uint32_t preferred_tx_streams; -#ifdef WMI_NON_TLV_SUPPORT +#ifndef CONFIG_MCL uint8_t oper_mode; int32_t dfs_pri_multiplier; uint8_t dot11_mode; @@ -634,7 +634,7 @@ typedef struct { struct stats_request_params { uint32_t stats_id; uint32_t vdev_id; -#ifdef WMI_NON_TLV_SUPPORT +#ifndef CONFIG_MCL wmi_host_inst_rssi_args rssi_args; #endif }; @@ -893,7 +893,7 @@ struct peer_assoc_params { uint32_t tx_max_rate; uint32_t tx_mcs_set; uint8_t vht_capable; -#ifdef WMI_NON_TLV_SUPPORT +#ifndef CONFIG_MCL uint32_t tx_max_mcs_nss; uint32_t peer_bw_rxnss_override; bool is_pmf_enabled; @@ -1019,7 +1019,7 @@ struct scan_start_params { uint8_t *ie_base; uint16_t uie_fieldOffset; uint8_t mac_add_bytes[IEEE80211_ADDR_LEN]; -#ifdef WMI_NON_TLV_SUPPORT +#ifndef CONFIG_MCL bool is_strict_pscan_en; bool is_promiscous_mode; bool is_phy_error; @@ -1051,7 +1051,7 @@ struct scan_stop_params { uint32_t scan_id; uint32_t req_type; uint32_t vdev_id; -#ifdef WMI_NON_TLV_SUPPORT +#ifndef CONFIG_MCL bool all_scans; bool vap_scans; bool specific_scan; @@ -1096,7 +1096,6 @@ struct scan_chan_list_params { * @ch_param: pointer to channel_paramw */ struct scan_chan_list_params { - uint8_t num_chan; uint16_t nallchans; struct channel_param ch_param[1]; }; @@ -1121,7 +1120,7 @@ struct fw_hang_params { struct pdev_utf_params { uint8_t *utf_payload; uint32_t len; -#ifdef WMI_NON_TLV_SUPPORT +#ifndef CONFIG_MCL bool is_ar900b; #endif }; @@ -1161,7 +1160,7 @@ struct dbglog_params { uint32_t val; uint32_t *module_id_bitmap; uint32_t bitmap_len; -#ifdef WMI_NON_TLV_SUPPORT +#ifndef CONFIG_MCL uint32_t cfgvalid[2]; #endif }; @@ -1720,7 +1719,7 @@ struct roam_offload_scan_params { #endif bool is_ese_assoc; struct mobility_domain_info mdid; -#ifndef WMI_NON_TLV_SUPPORT +#ifdef CONFIG_MCL /* THis is not available in non tlv target. * please remove this and replace with a host based * structure */ @@ -5770,6 +5769,15 @@ typedef enum { /* set group membership status */ WMI_HOST_PEER_MEMBERSHIP = 0xb, WMI_HOST_PEER_USERPOS = 0xc, + WMI_HOST_PEER_CRIT_PROTO_HINT_ENABLED = 0xd, + WMI_HOST_PEER_TX_FAIL_CNT_THR = 0xe, + WMI_HOST_PEER_SET_HW_RETRY_CTS2S = 0xf, + WMI_HOST_PEER_IBSS_ATIM_WINDOW_LENGTH = 0x10, + WMI_HOST_PEER_PHYMODE = 0x11, + WMI_HOST_PEER_SET_MAC_TX_RATE = 0x12, + /* Set default Rx routing */ + WMI_HOST_PEER_SET_DEFAULT_ROUTING = 0x13, + WMI_HOST_PEER_SET_MIN_TX_RATE = 0x14, } PEER_PARAM_ENUM; #define WMI_HOST_PEER_MIMO_PS_NONE 0x0 #define WMI_HOST_PEER_MIMO_PS_STATIC 0x1 diff --git a/wmi_unified_priv.h b/wmi_unified_priv.h index b9f1c8785a..1940531110 100644 --- a/wmi_unified_priv.h +++ b/wmi_unified_priv.h @@ -1169,7 +1169,7 @@ struct wmi_unified { qdf_nbuf_queue_t event_queue; struct work_struct rx_event_work; int wmi_stop_in_progress; -#ifndef WMI_NON_TLV_SUPPORT +#ifdef CONFIG_MCL struct _wmi_abi_version fw_abi_version; struct _wmi_abi_version final_abi_vers; #endif @@ -1198,7 +1198,7 @@ struct wmi_unified { bool use_cookie; bool wmi_stopinprogress; qdf_spinlock_t ctx_lock; -#ifdef WMI_TLV_AND_NON_TLV_SUPPORT +#ifndef CONFIG_MCL /* WMI service bitmap recieved from target */ uint32_t wmi_service_bitmap[wmi_services_max]; uint32_t wmi_events[wmi_events_max];