From 7517a8d7b92a39ea8ae81b9c7a35d113c58cf928 Mon Sep 17 00:00:00 2001 From: Shashikala Prabhu Date: Thu, 13 Dec 2018 18:02:45 +0530 Subject: [PATCH] qcacmn: Call regdb wrapper functions from other components Do not call regdb core functions from other components directly. Instead, call regdb dispatcher functions. Also, wlan_objmgr_vdev_obj.h file is removed from reg_services.h file in Ie43acc03a5c35200f3e43bc978b792d5047eeb77 and reg_services.h is removed from wlan_reg_services_api.h in I891b14fac7a4eddf2697d2ecdc0ac4a82046f532. Therefore to fix "'struct wlan_channel' declared inside parameter list" error in wlan_dfs_utils_api.h file, I have included wlan_objmgr_vdev_obj.h file before wlan_dfs_utils_api.h in scan, dfs and wmi component. Change-Id: Id8816f5137c3b1f9200c59fc3f9041980631f22f CRs-Fixed: 2349173 --- umac/dfs/core/src/filtering/dfs_partial_offload_radar.c | 3 ++- umac/dfs/core/src/filtering/dfs_process_radarevent.c | 3 ++- umac/dfs/core/src/misc/dfs.c | 3 ++- umac/dfs/core/src/misc/dfs_cac.c | 3 ++- umac/dfs/core/src/misc/dfs_nol.c | 3 ++- umac/dfs/core/src/misc/dfs_process_radar_found_ind.c | 1 + umac/dfs/dispatcher/inc/wlan_dfs_utils_api.h | 3 ++- umac/dfs/dispatcher/src/wlan_dfs_init_deinit_api.c | 3 ++- umac/dfs/dispatcher/src/wlan_dfs_utils_api.c | 4 +++- umac/global_umac_dispatcher/lmac_if/src/wlan_lmac_if.c | 3 ++- umac/scan/core/src/wlan_scan_cache_db.c | 1 + umac/scan/dispatcher/src/wlan_scan_ucfg_api.c | 1 + wmi/inc/wmi_unified_dfs_api.h | 3 ++- wmi/src/wmi_unified_dfs_api.c | 3 ++- 14 files changed, 26 insertions(+), 11 deletions(-) diff --git a/umac/dfs/core/src/filtering/dfs_partial_offload_radar.c b/umac/dfs/core/src/filtering/dfs_partial_offload_radar.c index 9493626d9e..4595f3db2b 100644 --- a/umac/dfs/core/src/filtering/dfs_partial_offload_radar.c +++ b/umac/dfs/core/src/filtering/dfs_partial_offload_radar.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2018 The Linux Foundation. All rights reserved. + * Copyright (c) 2016-2019 The Linux Foundation. All rights reserved. * Copyright (c) 2011, Atheros Communications Inc. * * Permission to use, copy, modify, and/or distribute this software for any @@ -22,6 +22,7 @@ #include "../dfs.h" #include "wlan_dfs_mlme_api.h" +#include #include "wlan_dfs_utils_api.h" #include "wlan_dfs_lmac_api.h" #include "../dfs_internal.h" diff --git a/umac/dfs/core/src/filtering/dfs_process_radarevent.c b/umac/dfs/core/src/filtering/dfs_process_radarevent.c index 97724715bc..41abd0f7ce 100644 --- a/umac/dfs/core/src/filtering/dfs_process_radarevent.c +++ b/umac/dfs/core/src/filtering/dfs_process_radarevent.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2016-2018 The Linux Foundation. All rights reserved. + * Copyright (c) 2013, 2016-2019 The Linux Foundation. All rights reserved. * Copyright (c) 2002-2010, Atheros Communications Inc. * * Permission to use, copy, modify, and/or distribute this software for any @@ -26,6 +26,7 @@ #include "../dfs_channel.h" #include "../dfs_internal.h" #include "../dfs_process_radar_found_ind.h" +#include #include "wlan_dfs_utils_api.h" #include "wlan_dfs_lmac_api.h" #include "../dfs_partial_offload_radar.h" diff --git a/umac/dfs/core/src/misc/dfs.c b/umac/dfs/core/src/misc/dfs.c index 2508d99722..c72765cbac 100644 --- a/umac/dfs/core/src/misc/dfs.c +++ b/umac/dfs/core/src/misc/dfs.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2018 The Linux Foundation. All rights reserved. + * Copyright (c) 2016-2019 The Linux Foundation. All rights reserved. * Copyright (c) 2002-2006, Atheros Communications Inc. * * Permission to use, copy, modify, and/or distribute this software for any @@ -29,6 +29,7 @@ #include "../dfs_internal.h" #include "../dfs_filter_init.h" #include "../dfs_full_offload.h" +#include #include "wlan_dfs_utils_api.h" #include "../dfs_etsi_precac.h" #include "../dfs_partial_offload_radar.h" diff --git a/umac/dfs/core/src/misc/dfs_cac.c b/umac/dfs/core/src/misc/dfs_cac.c index 973d2744a2..f5dc99db66 100644 --- a/umac/dfs/core/src/misc/dfs_cac.c +++ b/umac/dfs/core/src/misc/dfs_cac.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2018 The Linux Foundation. All rights reserved. + * Copyright (c) 2016-2019 The Linux Foundation. All rights reserved. * Copyright (c) 2007-2008 Sam Leffler, Errno Consulting * All rights reserved. * @@ -31,6 +31,7 @@ #include "../dfs_channel.h" #include "../dfs_zero_cac.h" #include "../dfs_etsi_precac.h" +#include #include "wlan_dfs_utils_api.h" #include "wlan_dfs_mlme_api.h" #include "../dfs_internal.h" diff --git a/umac/dfs/core/src/misc/dfs_nol.c b/umac/dfs/core/src/misc/dfs_nol.c index 4f24f3f808..5a81f5c4dc 100644 --- a/umac/dfs/core/src/misc/dfs_nol.c +++ b/umac/dfs/core/src/misc/dfs_nol.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2018 The Linux Foundation. All rights reserved. + * Copyright (c) 2016-2019 The Linux Foundation. All rights reserved. * Copyright (c) 2002-2010, Atheros Communications Inc. * * Permission to use, copy, modify, and/or distribute this software for any @@ -32,6 +32,7 @@ #include "../dfs_internal.h" #include #include +#include #include #include #if defined(WLAN_DFS_PARTIAL_OFFLOAD) && defined(HOST_DFS_SPOOF_TEST) diff --git a/umac/dfs/core/src/misc/dfs_process_radar_found_ind.c b/umac/dfs/core/src/misc/dfs_process_radar_found_ind.c index 9d7aa52c50..3b73b66a96 100644 --- a/umac/dfs/core/src/misc/dfs_process_radar_found_ind.c +++ b/umac/dfs/core/src/misc/dfs_process_radar_found_ind.c @@ -26,6 +26,7 @@ #include "../dfs_etsi_precac.h" #include "../dfs_process_radar_found_ind.h" #include +#include #include #include #include "wlan_dfs_mlme_api.h" diff --git a/umac/dfs/dispatcher/inc/wlan_dfs_utils_api.h b/umac/dfs/dispatcher/inc/wlan_dfs_utils_api.h index 9c9e8e82fa..ab52ddc0be 100644 --- a/umac/dfs/dispatcher/inc/wlan_dfs_utils_api.h +++ b/umac/dfs/dispatcher/inc/wlan_dfs_utils_api.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 @@ -27,6 +27,7 @@ #include "wlan_dfs_ucfg_api.h" #include "wlan_reg_services_api.h" +#include /* Add channel to nol */ #define DFS_NOL_SET 1 diff --git a/umac/dfs/dispatcher/src/wlan_dfs_init_deinit_api.c b/umac/dfs/dispatcher/src/wlan_dfs_init_deinit_api.c index 9f9b0acc86..dd6ec4f949 100644 --- a/umac/dfs/dispatcher/src/wlan_dfs_init_deinit_api.c +++ b/umac/dfs/dispatcher/src/wlan_dfs_init_deinit_api.c @@ -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 @@ -23,6 +23,7 @@ #include "wlan_dfs_ucfg_api.h" #include "wlan_dfs_tgt_api.h" +#include #include "wlan_dfs_utils_api.h" #ifndef QCA_MCL_DFS_SUPPORT #include "ieee80211_mlme_dfs_interface.h" diff --git a/umac/dfs/dispatcher/src/wlan_dfs_utils_api.c b/umac/dfs/dispatcher/src/wlan_dfs_utils_api.c index 64392ada9e..e089c5b919 100644 --- a/umac/dfs/dispatcher/src/wlan_dfs_utils_api.c +++ b/umac/dfs/dispatcher/src/wlan_dfs_utils_api.c @@ -21,6 +21,7 @@ * DOC: This file has the DFS dispatcher API implementation which is exposed * to outside of DFS component. */ +#include #include "wlan_dfs_utils_api.h" #include "wlan_dfs_init_deinit_api.h" #include "wlan_dfs_mlme_api.h" @@ -882,7 +883,8 @@ QDF_STATUS utils_dfs_bw_reduced_channel( return status; } - ch_state = reg_get_channel_state(pdev, dfs->dfs_curchan->dfs_ch_ieee); + ch_state = wlan_reg_get_channel_state(pdev, + dfs->dfs_curchan->dfs_ch_ieee); if (ch_state == CHANNEL_STATE_DFS || ch_state == CHANNEL_STATE_ENABLE) { 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 a0dc3e06a0..74b2990a28 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 @@ -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 @@ -47,6 +47,7 @@ #endif #ifdef DFS_COMPONENT_ENABLE #include +#include #include #endif diff --git a/umac/scan/core/src/wlan_scan_cache_db.c b/umac/scan/core/src/wlan_scan_cache_db.c index cacf7b0687..4278f95a4a 100644 --- a/umac/scan/core/src/wlan_scan_cache_db.c +++ b/umac/scan/core/src/wlan_scan_cache_db.c @@ -50,6 +50,7 @@ #include "wlan_scan_cache_db_i.h" #include "wlan_reg_services_api.h" #include "wlan_reg_ucfg_api.h" +#include #include /** diff --git a/umac/scan/dispatcher/src/wlan_scan_ucfg_api.c b/umac/scan/dispatcher/src/wlan_scan_ucfg_api.c index 03398114a6..1fb7384c18 100644 --- a/umac/scan/dispatcher/src/wlan_scan_ucfg_api.c +++ b/umac/scan/dispatcher/src/wlan_scan_ucfg_api.c @@ -37,6 +37,7 @@ #include #endif #ifdef WLAN_POLICY_MGR_ENABLE +#include #include #include #endif diff --git a/wmi/inc/wmi_unified_dfs_api.h b/wmi/inc/wmi_unified_dfs_api.h index b7e644702d..11202f7957 100644 --- a/wmi/inc/wmi_unified_dfs_api.h +++ b/wmi/inc/wmi_unified_dfs_api.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2018 The Linux Foundation. All rights reserved. + * Copyright (c) 2017-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 @@ -23,6 +23,7 @@ #ifndef _WMI_UNIFIED_DFS_API_H_ #define _WMI_UNIFIED_DFS_API_H_ +#include #include /** diff --git a/wmi/src/wmi_unified_dfs_api.c b/wmi/src/wmi_unified_dfs_api.c index 05bf68c5ff..69a68976d1 100644 --- a/wmi/src/wmi_unified_dfs_api.c +++ b/wmi/src/wmi_unified_dfs_api.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2018 The Linux Foundation. All rights reserved. + * Copyright (c) 2017-2019 The Linux Foundation. All rights reserved. * * * Permission to use, copy, modify, and/or distribute this software for @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include