瀏覽代碼

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
Shashikala Prabhu 6 年之前
父節點
當前提交
7517a8d7b9

+ 2 - 1
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 <wlan_objmgr_vdev_obj.h>
 #include "wlan_dfs_utils_api.h"
 #include "wlan_dfs_lmac_api.h"
 #include "../dfs_internal.h"

+ 2 - 1
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 <wlan_objmgr_vdev_obj.h>
 #include "wlan_dfs_utils_api.h"
 #include "wlan_dfs_lmac_api.h"
 #include "../dfs_partial_offload_radar.h"

+ 2 - 1
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 <wlan_objmgr_vdev_obj.h>
 #include "wlan_dfs_utils_api.h"
 #include "../dfs_etsi_precac.h"
 #include "../dfs_partial_offload_radar.h"

+ 2 - 1
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 <wlan_objmgr_vdev_obj.h>
 #include "wlan_dfs_utils_api.h"
 #include "wlan_dfs_mlme_api.h"
 #include "../dfs_internal.h"

+ 2 - 1
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 <qdf_time.h>
 #include <wlan_dfs_mlme_api.h>
+#include <wlan_objmgr_vdev_obj.h>
 #include <wlan_dfs_utils_api.h>
 #include <wlan_reg_services_api.h>
 #if defined(WLAN_DFS_PARTIAL_OFFLOAD) && defined(HOST_DFS_SPOOF_TEST)

+ 1 - 0
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 <wlan_reg_services_api.h>
+#include <wlan_objmgr_vdev_obj.h>
 #include <wlan_dfs_utils_api.h>
 #include <wlan_dfs_tgt_api.h>
 #include "wlan_dfs_mlme_api.h"

+ 2 - 1
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 <wlan_objmgr_vdev_obj.h>
 
 /* Add channel to nol */
 #define DFS_NOL_SET                  1

+ 2 - 1
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 <wlan_objmgr_vdev_obj.h>
 #include "wlan_dfs_utils_api.h"
 #ifndef QCA_MCL_DFS_SUPPORT
 #include "ieee80211_mlme_dfs_interface.h"

+ 3 - 1
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 <wlan_objmgr_vdev_obj.h>
 #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) {

+ 2 - 1
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 <wlan_dfs_tgt_api.h>
+#include <wlan_objmgr_vdev_obj.h>
 #include <wlan_dfs_utils_api.h>
 #endif
 

+ 1 - 0
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 <wlan_objmgr_vdev_obj.h>
 #include <wlan_dfs_utils_api.h>
 
 /**

+ 1 - 0
umac/scan/dispatcher/src/wlan_scan_ucfg_api.c

@@ -37,6 +37,7 @@
 #include <wlan_pmo_obj_mgmt_api.h>
 #endif
 #ifdef WLAN_POLICY_MGR_ENABLE
+#include <wlan_objmgr_vdev_obj.h>
 #include <wlan_dfs_utils_api.h>
 #include <wlan_policy_mgr_api.h>
 #endif

+ 2 - 1
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 <wlan_objmgr_vdev_obj.h>
 #include <wlan_dfs_utils_api.h>
 
 /**

+ 2 - 1
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 <qdf_module.h>
 #include <wmi_unified_api.h>
 #include <wmi_unified_priv.h>
+#include <wlan_objmgr_vdev_obj.h>
 #include <wlan_dfs_utils_api.h>
 #include <wmi_unified_dfs_api.h>
 #include <init_deinit_lmac.h>