diff --git a/dp/wifi3.0/dp_main.c b/dp/wifi3.0/dp_main.c index 86b2bb5497..226e9a29a6 100644 --- a/dp/wifi3.0/dp_main.c +++ b/dp/wifi3.0/dp_main.c @@ -9311,7 +9311,9 @@ static QDF_STATUS dp_runtime_resume(struct cdp_pdev *opaque_pdev) #ifndef CONFIG_WIN static struct cdp_misc_ops dp_ops_misc = { +#ifdef FEATURE_WLAN_TDLS .tx_non_std = dp_tx_non_std, +#endif /* FEATURE_WLAN_TDLS */ .get_opmode = dp_get_opmode, #ifdef FEATURE_RUNTIME_PM .runtime_suspend = dp_runtime_suspend, diff --git a/dp/wifi3.0/dp_tx.c b/dp/wifi3.0/dp_tx.c index 98cf682559..ccc58d8248 100644 --- a/dp/wifi3.0/dp_tx.c +++ b/dp/wifi3.0/dp_tx.c @@ -1290,7 +1290,7 @@ static void dp_tx_classify_tid(struct dp_vdev *vdev, qdf_nbuf_t nbuf, return; } -#ifdef CONVERGED_TDLS_ENABLE +#ifdef FEATURE_WLAN_TDLS /** * dp_tx_update_tdls_flags() - Update descriptor flags for TDLS frame * @tx_desc: TX descriptor @@ -1315,7 +1315,7 @@ static void dp_tx_update_tdls_flags(struct dp_tx_desc_s *tx_desc) * Return: None */ static void dp_non_std_tx_comp_free_buff(struct dp_tx_desc_s *tx_desc, - struct dp_vdev *vdev) + struct dp_vdev *vdev) { struct hal_tx_completion_status ts = {0}; qdf_nbuf_t nbuf = tx_desc->nbuf; @@ -1329,6 +1329,15 @@ static void dp_non_std_tx_comp_free_buff(struct dp_tx_desc_s *tx_desc, return; } } +#else +static inline void dp_tx_update_tdls_flags(struct dp_tx_desc_s *tx_desc) +{ +} + +static inline void dp_non_std_tx_comp_free_buff(struct dp_tx_desc_s *tx_desc, + struct dp_vdev *vdev) +{ +} #endif /** @@ -3287,7 +3296,7 @@ uint32_t dp_tx_comp_handler(struct dp_soc *soc, void *hal_srng, uint32_t quota) return num_processed; } -#ifdef CONVERGED_TDLS_ENABLE +#ifdef FEATURE_WLAN_TDLS /** * dp_tx_non_std() - Allow the control-path SW to send data frames * diff --git a/dp/wifi3.0/dp_tx.h b/dp/wifi3.0/dp_tx.h index 69a5ea6ce9..d2b163475d 100644 --- a/dp/wifi3.0/dp_tx.h +++ b/dp/wifi3.0/dp_tx.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2018 The Linux Foundation. All rights reserved. + * Copyright (c) 2016-2019 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -172,7 +172,7 @@ qdf_nbuf_t dp_tx_send_exception(void *data_vdev, qdf_nbuf_t nbuf, struct cdp_tx_exception_metadata *tx_exc); qdf_nbuf_t dp_tx_send_mesh(void *data_vdev, qdf_nbuf_t nbuf); -#ifdef CONVERGED_TDLS_ENABLE +#ifdef FEATURE_WLAN_TDLS qdf_nbuf_t dp_tx_non_std(struct cdp_vdev *vdev_handle, enum ol_tx_spec tx_spec, qdf_nbuf_t msdu_list); #endif @@ -182,23 +182,6 @@ uint32_t dp_tx_comp_handler(struct dp_soc *soc, void *hal_srng, uint32_t quota); QDF_STATUS dp_tx_prepare_send_me(struct dp_vdev *vdev, qdf_nbuf_t nbuf); -#ifndef CONVERGED_TDLS_ENABLE - -static inline void dp_tx_update_tdls_flags(struct dp_tx_desc_s *tx_desc) -{ - return; -} - -static inline void dp_non_std_tx_comp_free_buff(struct dp_tx_desc_s *tx_desc, - struct dp_vdev *vdev) -{ - return; -} - -#endif - - - #ifdef FEATURE_WDS void dp_tx_mec_handler(struct dp_vdev *vdev, uint8_t *status); #else diff --git a/target_if/core/src/target_if_main.c b/target_if/core/src/target_if_main.c index 1f2a8aed31..64cda921e2 100644 --- a/target_if/core/src/target_if_main.c +++ b/target_if/core/src/target_if_main.c @@ -50,7 +50,7 @@ #include "target_if_wifi_pos.h" #endif -#ifdef CONVERGED_TDLS_ENABLE +#ifdef FEATURE_WLAN_TDLS #include "target_if_tdls.h" #endif #ifdef QCA_SUPPORT_SON @@ -265,7 +265,7 @@ static void target_if_son_tx_ops_register( } #endif -#ifdef CONVERGED_TDLS_ENABLE +#ifdef FEATURE_WLAN_TDLS static void target_if_tdls_tx_ops_register(struct wlan_lmac_if_tx_ops *tx_ops) { target_if_tdls_register_tx_ops(tx_ops); @@ -274,7 +274,7 @@ static void target_if_tdls_tx_ops_register(struct wlan_lmac_if_tx_ops *tx_ops) static void target_if_tdls_tx_ops_register(struct wlan_lmac_if_tx_ops *tx_ops) { } -#endif /* CONVERGED_TDLS_ENABLE */ +#endif /* FEATURE_WLAN_TDLS */ #ifdef DFS_COMPONENT_ENABLE static void target_if_dfs_tx_ops_register( diff --git a/umac/global_umac_dispatcher/lmac_if/inc/wlan_lmac_if_def.h b/umac/global_umac_dispatcher/lmac_if/inc/wlan_lmac_if_def.h index 164c669fda..7462940f2a 100644 --- a/umac/global_umac_dispatcher/lmac_if/inc/wlan_lmac_if_def.h +++ b/umac/global_umac_dispatcher/lmac_if/inc/wlan_lmac_if_def.h @@ -64,7 +64,7 @@ struct oem_data_rsp; struct direct_buf_rx_data; #endif -#ifdef CONVERGED_TDLS_ENABLE +#ifdef FEATURE_WLAN_TDLS #include "wlan_tdls_public_structs.h" #endif @@ -558,7 +558,7 @@ struct wlan_lmac_if_direct_buf_rx_tx_ops { }; #endif -#ifdef CONVERGED_TDLS_ENABLE +#ifdef FEATURE_WLAN_TDLS /* fwd declarations for tdls tx ops */ struct tdls_info; struct tdls_peer_update_state; @@ -833,7 +833,7 @@ struct wlan_lmac_if_tx_ops { struct wlan_lmac_if_reg_tx_ops reg_ops; struct wlan_lmac_if_dfs_tx_ops dfs_tx_ops; -#ifdef CONVERGED_TDLS_ENABLE +#ifdef FEATURE_WLAN_TDLS struct wlan_lmac_if_tdls_tx_ops tdls_tx_ops; #endif @@ -1453,7 +1453,7 @@ struct wlan_lmac_if_rx_ops { #endif struct wlan_lmac_if_reg_rx_ops reg_rx_ops; struct wlan_lmac_if_dfs_rx_ops dfs_rx_ops; -#ifdef CONVERGED_TDLS_ENABLE +#ifdef FEATURE_WLAN_TDLS struct wlan_lmac_if_tdls_rx_ops tdls_rx_ops; #endif diff --git a/umac/global_umac_dispatcher/lmac_if/src/wlan_lmac_if.c b/umac/global_umac_dispatcher/lmac_if/src/wlan_lmac_if.c index 9d990e70d5..a17133eb0d 100644 --- a/umac/global_umac_dispatcher/lmac_if/src/wlan_lmac_if.c +++ b/umac/global_umac_dispatcher/lmac_if/src/wlan_lmac_if.c @@ -38,7 +38,7 @@ #ifdef CONVERGED_P2P_ENABLE #include "wlan_p2p_tgt_api.h" #endif -#ifdef CONVERGED_TDLS_ENABLE +#ifdef FEATURE_WLAN_TDLS #include "wlan_tdls_tgt_api.h" #endif @@ -406,7 +406,7 @@ wlan_lmac_if_umac_dfs_rx_ops_register(struct wlan_lmac_if_rx_ops *rx_ops) } #endif -#ifdef CONVERGED_TDLS_ENABLE +#ifdef FEATURE_WLAN_TDLS static QDF_STATUS wlan_lmac_if_umac_tdls_rx_ops_register(struct wlan_lmac_if_rx_ops *rx_ops) { diff --git a/wmi/inc/wmi_unified_param.h b/wmi/inc/wmi_unified_param.h index 2f85c2d573..abcf7a21ef 100644 --- a/wmi/inc/wmi_unified_param.h +++ b/wmi/inc/wmi_unified_param.h @@ -25,7 +25,7 @@ #define _WMI_UNIFIED_PARAM_H_ #include -#ifdef CONVERGED_TDLS_ENABLE +#ifdef FEATURE_WLAN_TDLS #include #endif diff --git a/wmi/inc/wmi_unified_priv.h b/wmi/inc/wmi_unified_priv.h index a467f75ba9..8a7ceda5f9 100644 --- a/wmi/inc/wmi_unified_priv.h +++ b/wmi/inc/wmi_unified_priv.h @@ -930,7 +930,7 @@ QDF_STATUS (*extract_encrypt_decrypt_resp_event)(wmi_unified_t wmi_handle, struct disa_encrypt_decrypt_resp_params *resp); #endif -#ifdef CONVERGED_TDLS_ENABLE +#ifdef FEATURE_WLAN_TDLS QDF_STATUS (*send_set_tdls_offchan_mode_cmd)(wmi_unified_t wmi_handle, struct tdls_channel_switch_params *chan_switch_params); @@ -944,7 +944,7 @@ QDF_STATUS (*send_update_tdls_peer_state_cmd)(wmi_unified_t wmi_handle, QDF_STATUS (*extract_vdev_tdls_ev_param)(wmi_unified_t wmi_handle, void *evt_buf, struct tdls_event_info *param); -#endif /* CONVERGED_TDLS_ENABLE */ +#endif /* FEATURE_WLAN_TDLS */ #endif /* WMI_STA_SUPPORT */ QDF_STATUS (*send_stats_ext_req_cmd)(wmi_unified_t wmi_handle, @@ -2236,7 +2236,7 @@ static inline void wmi_pmo_attach_tlv(struct wmi_unified *wmi_handle) } #endif -#ifdef CONVERGED_TDLS_ENABLE +#ifdef FEATURE_WLAN_TDLS void wmi_tdls_attach_tlv(struct wmi_unified *wmi_handle); #else static inline void wmi_tdls_attach_tlv(struct wmi_unified *wmi_handle) diff --git a/wmi/inc/wmi_unified_sta_api.h b/wmi/inc/wmi_unified_sta_api.h index 1cff089af9..1288d5a9ca 100644 --- a/wmi/inc/wmi_unified_sta_api.h +++ b/wmi/inc/wmi_unified_sta_api.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2018 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2019 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -168,7 +168,7 @@ QDF_STATUS wmi_unified_process_set_ie_info_cmd(void *wmi_hdl, QDF_STATUS wmi_unified_set_base_macaddr_indicate_cmd(void *wmi_hdl, uint8_t *custom_addr); -#ifdef CONVERGED_TDLS_ENABLE +#ifdef FEATURE_WLAN_TDLS /** * wmi_unified_set_tdls_offchan_mode_cmd() - set tdls off channel mode * @wmi_handle: wmi handle @@ -215,7 +215,7 @@ QDF_STATUS wmi_unified_update_tdls_peer_state_cmd(void *wmi_hdl, */ QDF_STATUS wmi_extract_vdev_tdls_ev_param(void *wmi_hdl, void *evt_buf, struct tdls_event_info *param); -#endif /* CONVERGED_TDLS_ENABLE */ +#endif /* FEATURE_WLAN_TDLS */ /** * wmi_unified_send_sar_limit_cmd() - send sar limit cmd to fw diff --git a/wmi/inc/wmi_unified_sta_param.h b/wmi/inc/wmi_unified_sta_param.h index d19747da95..6190d2ceef 100644 --- a/wmi/inc/wmi_unified_sta_param.h +++ b/wmi/inc/wmi_unified_sta_param.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2018 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2019 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -99,27 +99,6 @@ struct wlm_latency_level_param { uint16_t vdev_id; }; -#ifndef CONVERGED_TDLS_ENABLE -/** - * struct tdls_chan_switch_params - channel switch parameter structure - * @vdev_id: vdev ID - * @peer_mac_addr: Peer mac address - * @tdls_off_ch_bw_offset: Target off-channel bandwitdh offset - * @tdls_off_ch: Target Off Channel - * @oper_class: Operating class for target channel - * @is_responder: Responder or initiator - */ -struct tdls_channel_switch_params { - uint32_t vdev_id; - uint8_t peer_mac_addr[IEEE80211_ADDR_LEN]; - uint16_t tdls_off_ch_bw_offset; - uint8_t tdls_off_ch; - uint8_t tdls_sw_mode; - uint8_t oper_class; - uint8_t is_responder; -}; -#endif - #define WMI_TDLS_MAX_SUPP_CHANNELS 128 #define WMI_TDLS_MAX_SUPP_OPER_CLASSES 32 #define WMI_2_4_GHZ_MAX_FREQ 3000 diff --git a/wmi/src/wmi_unified_sta_api.c b/wmi/src/wmi_unified_sta_api.c index f71c54055c..c9ac20cd96 100644 --- a/wmi/src/wmi_unified_sta_api.c +++ b/wmi/src/wmi_unified_sta_api.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2018 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2019 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -147,7 +147,7 @@ QDF_STATUS wmi_unified_set_base_macaddr_indicate_cmd(void *wmi_hdl, return QDF_STATUS_E_FAILURE; } -#ifdef CONVERGED_TDLS_ENABLE +#ifdef FEATURE_WLAN_TDLS QDF_STATUS wmi_unified_set_tdls_offchan_mode_cmd(void *wmi_hdl, struct tdls_channel_switch_params *chan_switch_params) { @@ -197,7 +197,7 @@ QDF_STATUS wmi_extract_vdev_tdls_ev_param(void *wmi_hdl, void *evt_buf, return QDF_STATUS_E_FAILURE; } -#endif /* CONVERGED_TDLS_ENABLE */ +#endif /* FEATURE_WLAN_TDLS */ #ifdef WLAN_FEATURE_DISA QDF_STATUS wmi_unified_encrypt_decrypt_send_cmd(void *wmi_hdl, diff --git a/wmi/src/wmi_unified_sta_tlv.c b/wmi/src/wmi_unified_sta_tlv.c index a1ff6527a3..aa2d617a68 100644 --- a/wmi/src/wmi_unified_sta_tlv.c +++ b/wmi/src/wmi_unified_sta_tlv.c @@ -22,7 +22,7 @@ #include "wmi_unified_priv.h" #include "wmi_unified_sta_param.h" #include "wmi_unified_sta_api.h" -#ifdef CONVERGED_TDLS_ENABLE +#ifdef FEATURE_WLAN_TDLS #include #endif @@ -505,7 +505,7 @@ static QDF_STATUS send_wlm_latency_level_cmd_tlv(wmi_unified_t wmi_handle, return 0; } -#ifdef CONVERGED_TDLS_ENABLE +#ifdef FEATURE_WLAN_TDLS /** * tdls_get_wmi_offchannel_mode - Get WMI tdls off channel mode * @tdls_sw_mode: tdls_sw_mode @@ -995,7 +995,7 @@ void wmi_tdls_attach_tlv(struct wmi_unified *wmi_handle) send_update_tdls_peer_state_cmd_tlv; ops->extract_vdev_tdls_ev_param = extract_vdev_tdls_ev_param_tlv; } -#endif /* CONVERGED_TDLS_ENABLE */ +#endif /* FEATURE_WLAN_TDLS */ /* * send_process_set_ie_info_cmd_tlv() - Function to send IE info to firmware