From 43ee7b0343940c0edd2083399c7e8b9cf6c4ca3b Mon Sep 17 00:00:00 2001 From: "Baila, Shashikala Prabhu" Date: Tue, 9 May 2017 21:06:48 +0530 Subject: [PATCH] qcacmn: DFS: Get DFS domain from regulatory component Get the dfs domain from reg component instead of using it from offload or lmac layer. Change-Id: I3007ac483c44723b13a0af22df6eb56deac4c7ed CRs-Fixed: 2047212 --- umac/dfs/dispatcher/src/wlan_dfs_lmac_api.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/umac/dfs/dispatcher/src/wlan_dfs_lmac_api.c b/umac/dfs/dispatcher/src/wlan_dfs_lmac_api.c index 6559676f19bb..904ebb9b79f4 100644 --- a/umac/dfs/dispatcher/src/wlan_dfs_lmac_api.c +++ b/umac/dfs/dispatcher/src/wlan_dfs_lmac_api.c @@ -23,6 +23,7 @@ #include "wlan_dfs_lmac_api.h" #include "../../core/src/dfs_internal.h" +#include void lmac_get_caps(struct wlan_objmgr_pdev *pdev, bool *ext_chan, @@ -93,17 +94,13 @@ void lmac_dfs_disable(struct wlan_objmgr_pdev *pdev, int no_cac) int lmac_get_dfsdomain(struct wlan_objmgr_pdev *pdev) { struct wlan_objmgr_psoc *psoc; - struct wlan_lmac_if_dfs_tx_ops *dfs_tx_ops; - int dfsdomain = DFS_FCC_DOMAIN; + enum dfs_reg dfsdomain; wlan_pdev_obj_lock(pdev); psoc = wlan_pdev_get_psoc(pdev); wlan_pdev_obj_unlock(pdev); - dfs_tx_ops = &psoc->soc_cb.tx_ops.dfs_tx_ops; - - if (dfs_tx_ops->dfs_get_dfsdomain) - dfs_tx_ops->dfs_get_dfsdomain(pdev, &dfsdomain); + wlan_reg_get_dfs_region(psoc, &dfsdomain); return dfsdomain; }