diff --git a/umac/dfs/dispatcher/src/wlan_dfs_tgt_api.c b/umac/dfs/dispatcher/src/wlan_dfs_tgt_api.c index e4036cfd49c5..664b179955c3 100644 --- a/umac/dfs/dispatcher/src/wlan_dfs_tgt_api.c +++ b/umac/dfs/dispatcher/src/wlan_dfs_tgt_api.c @@ -23,6 +23,7 @@ */ #include #include "wlan_dfs_tgt_api.h" +#include "wlan_dfs_init_deinit_api.h" #include "wlan_lmac_if_def.h" #include "wlan_lmac_if_api.h" #include "wlan_dfs_mlme_api.h" @@ -79,7 +80,7 @@ QDF_STATUS tgt_dfs_set_current_channel(struct wlan_objmgr_pdev *pdev, if (!tgt_dfs_is_pdev_5ghz(pdev)) return QDF_STATUS_SUCCESS; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) { dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "dfs is NULL"); return QDF_STATUS_E_FAILURE; @@ -105,7 +106,7 @@ QDF_STATUS tgt_dfs_radar_enable(struct wlan_objmgr_pdev *pdev, struct wlan_objmgr_psoc *psoc; QDF_STATUS status; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) { dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "dfs is NULL"); return QDF_STATUS_E_FAILURE; @@ -142,7 +143,7 @@ void tgt_dfs_is_radar_enabled(struct wlan_objmgr_pdev *pdev, int *ignore_dfs) { struct wlan_dfs *dfs; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) { dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "dfs is NULL"); return; @@ -163,7 +164,7 @@ QDF_STATUS tgt_dfs_process_phyerr(struct wlan_objmgr_pdev *pdev, { struct wlan_dfs *dfs; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) { dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "dfs is NULL"); return QDF_STATUS_E_FAILURE; @@ -188,7 +189,7 @@ QDF_STATUS tgt_dfs_process_phyerr_filter_offload(struct wlan_objmgr_pdev *pdev, { struct wlan_dfs *dfs; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) { dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "dfs is NULL"); return QDF_STATUS_E_FAILURE; @@ -250,7 +251,7 @@ QDF_STATUS tgt_dfs_is_precac_timer_running(struct wlan_objmgr_pdev *pdev, if (!tgt_dfs_is_pdev_5ghz(pdev)) return QDF_STATUS_SUCCESS; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) { dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "dfs is NULL"); return QDF_STATUS_E_FAILURE; @@ -269,7 +270,7 @@ QDF_STATUS tgt_dfs_get_radars(struct wlan_objmgr_pdev *pdev) if (!tgt_dfs_is_pdev_5ghz(pdev)) return QDF_STATUS_SUCCESS; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) { dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "dfs is NULL"); return QDF_STATUS_E_FAILURE; @@ -286,7 +287,7 @@ QDF_STATUS tgt_dfs_destroy_object(struct wlan_objmgr_pdev *pdev) { struct wlan_dfs *dfs; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) { dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "dfs is NULL"); return QDF_STATUS_E_FAILURE; @@ -304,7 +305,7 @@ QDF_STATUS tgt_dfs_set_tx_leakage_threshold(struct wlan_objmgr_pdev *pdev, { struct wlan_dfs *dfs; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) { dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "dfs is NULL"); return QDF_STATUS_E_FAILURE; @@ -327,7 +328,7 @@ QDF_STATUS tgt_dfs_control(struct wlan_objmgr_pdev *pdev, { struct wlan_dfs *dfs; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) { dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "dfs is NULL"); return QDF_STATUS_E_FAILURE; @@ -350,7 +351,7 @@ QDF_STATUS tgt_dfs_find_vht80_chan_for_precac(struct wlan_objmgr_pdev *pdev, { struct wlan_dfs *dfs; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) { dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "dfs is NULL"); return QDF_STATUS_E_FAILURE; @@ -380,7 +381,7 @@ QDF_STATUS tgt_dfs_process_radar_ind(struct wlan_objmgr_pdev *pdev, return status; } - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) { dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "dfs is null"); return status; @@ -438,7 +439,7 @@ QDF_STATUS tgt_dfs_stop(struct wlan_objmgr_pdev *pdev) if (!tgt_dfs_is_pdev_5ghz(pdev)) return QDF_STATUS_SUCCESS; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) { dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "dfs is NULL"); return QDF_STATUS_E_FAILURE; @@ -517,7 +518,7 @@ tgt_dfs_send_avg_params_to_fw(struct wlan_objmgr_pdev *pdev, struct wlan_dfs *dfs; QDF_STATUS status = QDF_STATUS_E_FAILURE; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) { dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "dfs is NULL"); return status; @@ -551,7 +552,7 @@ QDF_STATUS tgt_dfs_action_on_status_from_fw(struct wlan_objmgr_pdev *pdev, { struct wlan_dfs *dfs; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) { dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "dfs is NULL"); return QDF_STATUS_E_FAILURE; @@ -571,7 +572,7 @@ QDF_STATUS tgt_dfs_reset_spoof_test(struct wlan_objmgr_pdev *pdev) if (!tgt_dfs_is_pdev_5ghz(pdev)) return QDF_STATUS_SUCCESS; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) { dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "dfs is NULL"); return QDF_STATUS_E_FAILURE; @@ -646,7 +647,7 @@ void tgt_dfs_enable_stadfs(struct wlan_objmgr_pdev *pdev, bool val) { struct wlan_dfs *dfs; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) { dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "dfs is NULL"); return; @@ -659,7 +660,7 @@ bool tgt_dfs_is_stadfs_enabled(struct wlan_objmgr_pdev *pdev) { struct wlan_dfs *dfs; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) { dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "dfs is NULL"); return false; diff --git a/umac/dfs/dispatcher/src/wlan_dfs_ucfg_api.c b/umac/dfs/dispatcher/src/wlan_dfs_ucfg_api.c index 1448bf83dca5..1709fe17e23f 100644 --- a/umac/dfs/dispatcher/src/wlan_dfs_ucfg_api.c +++ b/umac/dfs/dispatcher/src/wlan_dfs_ucfg_api.c @@ -23,6 +23,7 @@ */ #include "wlan_dfs_ucfg_api.h" +#include "wlan_dfs_init_deinit_api.h" #include "../../core/src/dfs.h" #include "../../core/src/dfs_zero_cac.h" #include "../../core/src/dfs_partial_offload_radar.h" @@ -34,7 +35,7 @@ QDF_STATUS ucfg_dfs_is_ap_cac_timer_running(struct wlan_objmgr_pdev *pdev, { struct wlan_dfs *dfs; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) return QDF_STATUS_E_FAILURE; @@ -49,7 +50,7 @@ QDF_STATUS ucfg_dfs_getnol(struct wlan_objmgr_pdev *pdev, { struct wlan_dfs *dfs; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) return QDF_STATUS_E_FAILURE; @@ -65,7 +66,7 @@ QDF_STATUS ucfg_dfs_override_cac_timeout(struct wlan_objmgr_pdev *pdev, { struct wlan_dfs *dfs; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) return QDF_STATUS_E_FAILURE; @@ -81,7 +82,7 @@ QDF_STATUS ucfg_dfs_get_override_cac_timeout(struct wlan_objmgr_pdev *pdev, { struct wlan_dfs *dfs; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) return QDF_STATUS_E_FAILURE; @@ -96,7 +97,7 @@ QDF_STATUS ucfg_dfs_get_override_precac_timeout(struct wlan_objmgr_pdev *pdev, { struct wlan_dfs *dfs; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) return QDF_STATUS_E_FAILURE; @@ -111,7 +112,7 @@ QDF_STATUS ucfg_dfs_override_precac_timeout(struct wlan_objmgr_pdev *pdev, { struct wlan_dfs *dfs; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) return QDF_STATUS_E_FAILURE; @@ -126,7 +127,7 @@ QDF_STATUS ucfg_dfs_set_precac_enable(struct wlan_objmgr_pdev *pdev, { struct wlan_dfs *dfs; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) { dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "null dfs"); return QDF_STATUS_E_FAILURE; @@ -146,7 +147,7 @@ QDF_STATUS ucfg_dfs_get_precac_enable(struct wlan_objmgr_pdev *pdev, if (!tgt_dfs_is_pdev_5ghz(pdev)) return QDF_STATUS_SUCCESS; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) { dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "null dfs"); return QDF_STATUS_E_FAILURE; @@ -164,7 +165,7 @@ ucfg_dfs_set_nol_subchannel_marking(struct wlan_objmgr_pdev *pdev, { struct wlan_dfs *dfs; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) return QDF_STATUS_E_FAILURE; @@ -179,7 +180,7 @@ QDF_STATUS ucfg_dfs_get_nol_subchannel_marking(struct wlan_objmgr_pdev *pdev, { struct wlan_dfs *dfs; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) return QDF_STATUS_E_FAILURE; @@ -194,7 +195,7 @@ QDF_STATUS ucfg_dfs_set_precac_intermediate_chan(struct wlan_objmgr_pdev *pdev, { struct wlan_dfs *dfs; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) { dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "null dfs"); return QDF_STATUS_E_FAILURE; @@ -210,7 +211,7 @@ QDF_STATUS ucfg_dfs_get_precac_intermediate_chan(struct wlan_objmgr_pdev *pdev, { struct wlan_dfs *dfs; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) { dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "null dfs"); return QDF_STATUS_E_FAILURE; @@ -228,7 +229,7 @@ ucfg_dfs_get_precac_chan_state(struct wlan_objmgr_pdev *pdev, struct wlan_dfs *dfs; enum precac_chan_state retval = PRECAC_ERR; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) { dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "null dfs"); return PRECAC_ERR; @@ -278,7 +279,7 @@ QDF_STATUS ucfg_dfs_set_override_status_timeout(struct wlan_objmgr_pdev *pdev, { struct wlan_dfs *dfs; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) { dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "null dfs"); return QDF_STATUS_E_FAILURE; @@ -296,7 +297,7 @@ QDF_STATUS ucfg_dfs_get_override_status_timeout(struct wlan_objmgr_pdev *pdev, { struct wlan_dfs *dfs; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) { dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "null dfs"); return QDF_STATUS_E_FAILURE; diff --git a/umac/dfs/dispatcher/src/wlan_dfs_utils_api.c b/umac/dfs/dispatcher/src/wlan_dfs_utils_api.c index 62bf21808ab9..fef293c311bf 100644 --- a/umac/dfs/dispatcher/src/wlan_dfs_utils_api.c +++ b/umac/dfs/dispatcher/src/wlan_dfs_utils_api.c @@ -22,6 +22,7 @@ * to outside of DFS component. */ #include "wlan_dfs_utils_api.h" +#include "wlan_dfs_init_deinit_api.h" #include "wlan_dfs_mlme_api.h" #include "../../core/src/dfs.h" #include "../../core/src/dfs_zero_cac.h" @@ -45,7 +46,7 @@ QDF_STATUS utils_dfs_reset(struct wlan_objmgr_pdev *pdev) { struct wlan_dfs *dfs; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) return QDF_STATUS_E_FAILURE; @@ -61,7 +62,7 @@ bool utils_dfs_freq_is_in_nol(struct wlan_objmgr_pdev *pdev, uint32_t freq) { struct wlan_dfs *dfs; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) return false; @@ -74,7 +75,7 @@ QDF_STATUS utils_dfs_cac_valid_reset(struct wlan_objmgr_pdev *pdev, { struct wlan_dfs *dfs; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) return QDF_STATUS_E_FAILURE; @@ -88,7 +89,7 @@ QDF_STATUS utils_dfs_reset_precaclists(struct wlan_objmgr_pdev *pdev) { struct wlan_dfs *dfs; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) return QDF_STATUS_E_FAILURE; @@ -103,7 +104,7 @@ QDF_STATUS utils_dfs_reset_etsi_precaclists(struct wlan_objmgr_pdev *pdev) { struct wlan_dfs *dfs; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) return QDF_STATUS_E_FAILURE; @@ -119,7 +120,7 @@ QDF_STATUS utils_dfs_cancel_precac_timer(struct wlan_objmgr_pdev *pdev) { struct wlan_dfs *dfs; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) return QDF_STATUS_E_FAILURE; @@ -133,7 +134,7 @@ QDF_STATUS utils_dfs_start_precac_timer(struct wlan_objmgr_pdev *pdev) { struct wlan_dfs *dfs; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) { dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "NULL dfs"); return QDF_STATUS_E_FAILURE; @@ -148,7 +149,7 @@ QDF_STATUS utils_dfs_precac_decide_pref_chan(struct wlan_objmgr_pdev *pdev, { struct wlan_dfs *dfs; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) { dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "NULL dfs"); return QDF_STATUS_E_FAILURE; @@ -163,7 +164,7 @@ QDF_STATUS utils_dfs_cancel_cac_timer(struct wlan_objmgr_pdev *pdev) { struct wlan_dfs *dfs; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) return QDF_STATUS_E_FAILURE; @@ -177,7 +178,7 @@ QDF_STATUS utils_dfs_start_cac_timer(struct wlan_objmgr_pdev *pdev) { struct wlan_dfs *dfs; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) return QDF_STATUS_E_FAILURE; @@ -191,7 +192,7 @@ QDF_STATUS utils_dfs_cac_stop(struct wlan_objmgr_pdev *pdev) { struct wlan_dfs *dfs; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) return QDF_STATUS_E_FAILURE; @@ -204,7 +205,7 @@ void utils_dfs_clear_cac_started_chan(struct wlan_objmgr_pdev *pdev) { struct wlan_dfs *dfs; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) return; @@ -247,7 +248,7 @@ bool utils_dfs_check_for_cac_start(struct wlan_objmgr_pdev *pdev, { struct wlan_dfs *dfs; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) return false; @@ -258,7 +259,7 @@ QDF_STATUS utils_dfs_stacac_stop(struct wlan_objmgr_pdev *pdev) { struct wlan_dfs *dfs; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) return QDF_STATUS_E_FAILURE; @@ -272,7 +273,7 @@ QDF_STATUS utils_dfs_get_usenol(struct wlan_objmgr_pdev *pdev, uint16_t *usenol) { struct wlan_dfs *dfs; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) return QDF_STATUS_E_FAILURE; @@ -286,7 +287,7 @@ QDF_STATUS utils_dfs_radar_disable(struct wlan_objmgr_pdev *pdev) { struct wlan_dfs *dfs; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) return QDF_STATUS_E_FAILURE; @@ -301,7 +302,7 @@ QDF_STATUS utils_dfs_set_update_nol_flag(struct wlan_objmgr_pdev *pdev, { struct wlan_dfs *dfs; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) return QDF_STATUS_E_FAILURE; @@ -316,7 +317,7 @@ QDF_STATUS utils_dfs_get_update_nol_flag(struct wlan_objmgr_pdev *pdev, { struct wlan_dfs *dfs; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) return QDF_STATUS_E_FAILURE; @@ -331,7 +332,7 @@ QDF_STATUS utils_dfs_get_dfs_use_nol(struct wlan_objmgr_pdev *pdev, { struct wlan_dfs *dfs; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) return QDF_STATUS_E_FAILURE; @@ -346,7 +347,7 @@ QDF_STATUS utils_dfs_get_nol_timeout(struct wlan_objmgr_pdev *pdev, { struct wlan_dfs *dfs; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) return QDF_STATUS_E_FAILURE; @@ -362,7 +363,7 @@ QDF_STATUS utils_dfs_nol_addchan(struct wlan_objmgr_pdev *pdev, { struct wlan_dfs *dfs; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) return QDF_STATUS_E_FAILURE; @@ -376,7 +377,7 @@ QDF_STATUS utils_dfs_nol_update(struct wlan_objmgr_pdev *pdev) { struct wlan_dfs *dfs; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) return QDF_STATUS_E_FAILURE; @@ -390,7 +391,7 @@ QDF_STATUS utils_dfs_second_segment_radar_disable(struct wlan_objmgr_pdev *pdev) { struct wlan_dfs *dfs; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) return QDF_STATUS_E_FAILURE; @@ -494,7 +495,7 @@ QDF_STATUS utils_dfs_set_cac_timer_running(struct wlan_objmgr_pdev *pdev, { struct wlan_dfs *dfs; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) return QDF_STATUS_E_FAILURE; @@ -512,7 +513,7 @@ QDF_STATUS utils_dfs_get_nol_chfreq_and_chwidth(struct wlan_objmgr_pdev *pdev, { struct wlan_dfs *dfs; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) return QDF_STATUS_E_FAILURE; @@ -528,7 +529,7 @@ QDF_STATUS utils_dfs_update_cur_chan_flags(struct wlan_objmgr_pdev *pdev, { struct wlan_dfs *dfs; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) return QDF_STATUS_E_FAILURE; @@ -560,7 +561,7 @@ void utils_dfs_get_nol_history_chan_list(struct wlan_objmgr_pdev *pdev, *num_chan = 0; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) return; @@ -596,7 +597,7 @@ void utils_dfs_get_chan_list(struct wlan_objmgr_pdev *pdev, struct wlan_dfs *dfs; struct dfs_channel *chan_list = (struct dfs_channel *)clist; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) return; @@ -664,7 +665,7 @@ static void utils_dfs_get_channel_list(struct wlan_objmgr_pdev *pdev, uint16_t flagext; int i, j = 0; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) { dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "null dfs"); return; @@ -801,7 +802,7 @@ QDF_STATUS utils_dfs_get_random_channel( goto random_chan_error; } - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) { dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "null dfs"); goto random_chan_error; @@ -873,7 +874,7 @@ QDF_STATUS utils_dfs_bw_reduced_channel( return status; } - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) { dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "null dfs"); return status; @@ -911,7 +912,7 @@ void utils_dfs_init_nol(struct wlan_objmgr_pdev *pdev) struct dfs_nol_info *dfs_nolinfo; int len; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); psoc = wlan_pdev_get_psoc(pdev); if (!dfs || !psoc) { dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, @@ -959,7 +960,7 @@ void utils_dfs_save_nol(struct wlan_objmgr_pdev *pdev) qdf_device_t qdf_dev; int num_chans = 0; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) { dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "null dfs"); return; @@ -1004,7 +1005,7 @@ void utils_dfs_print_nol_channels(struct wlan_objmgr_pdev *pdev) { struct wlan_dfs *dfs = NULL; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) { dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "null dfs"); return; @@ -1018,7 +1019,7 @@ void utils_dfs_clear_nol_channels(struct wlan_objmgr_pdev *pdev) { struct wlan_dfs *dfs = NULL; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) { dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "null dfs"); return; @@ -1105,7 +1106,7 @@ QDF_STATUS utils_dfs_mark_leaking_ch(struct wlan_objmgr_pdev *pdev, { struct wlan_dfs *dfs = NULL; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) { dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "null dfs"); return QDF_STATUS_E_FAILURE; @@ -1143,7 +1144,7 @@ QDF_STATUS utils_dfs_is_spoof_check_failed(struct wlan_objmgr_pdev *pdev, if (!tgt_dfs_is_pdev_5ghz(pdev)) return QDF_STATUS_SUCCESS; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) { dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "dfs is null"); return QDF_STATUS_E_FAILURE; @@ -1171,7 +1172,7 @@ QDF_STATUS utils_dfs_get_disable_radar_marking(struct wlan_objmgr_pdev *pdev, if (!tgt_dfs_is_pdev_5ghz(pdev)) return QDF_STATUS_SUCCESS; - dfs = global_dfs_to_mlme.pdev_get_comp_private_obj(pdev); + dfs = wlan_pdev_get_dfs_obj(pdev); if (!dfs) { dfs_err(dfs, WLAN_DEBUG_DFS_ALWAYS, "dfs is null"); return QDF_STATUS_E_FAILURE;