Bladeren bron

qcacmn: Fix compile error

When build driver as static module with kernel,
the reg_get_dfs_region function name conflicts
with kernel function.

Fix by rename reg_get_dfs_region to
reg_get_current_dfs_region.

Change-Id: If2908f37c338b1dbf8290d10838f53848637271c
CRs-Fixed: 2127803
Liangwei Dong 7 jaren geleden
bovenliggende
commit
8b6b17b592

+ 2 - 2
umac/regulatory/core/src/reg_services.c

@@ -1418,12 +1418,12 @@ QDF_STATUS reg_reset_country(struct wlan_objmgr_psoc *psoc)
 }
 
 /**
- * reg_get_dfs_region () - Get the current dfs region
+ * reg_get_current_dfs_region () - Get the current dfs region
  * @dfs_reg: pointer to dfs region
  *
  * Return: None
  */
-void reg_get_dfs_region(struct wlan_objmgr_pdev *pdev,
+void reg_get_current_dfs_region(struct wlan_objmgr_pdev *pdev,
 			enum dfs_reg *dfs_reg)
 {
 	struct wlan_regulatory_pdev_priv_obj *pdev_priv_obj;

+ 1 - 1
umac/regulatory/core/src/reg_services.h

@@ -180,7 +180,7 @@ QDF_STATUS reg_reset_country(struct wlan_objmgr_psoc *psoc);
 QDF_STATUS reg_enable_dfs_channels(struct wlan_objmgr_pdev *pdev, bool enable);
 
 
-void reg_get_dfs_region(struct wlan_objmgr_pdev *pdev,
+void reg_get_current_dfs_region(struct wlan_objmgr_pdev *pdev,
 			enum dfs_reg *dfs_reg);
 
 uint32_t reg_get_channel_reg_power(struct wlan_objmgr_pdev *pdev,

+ 1 - 1
umac/regulatory/dispatcher/src/wlan_reg_services_api.c

@@ -140,7 +140,7 @@ QDF_STATUS wlan_reg_get_dfs_region(struct wlan_objmgr_pdev *pdev,
 	/*
 	 * Get the current dfs region
 	 */
-	reg_get_dfs_region(pdev, dfs_reg);
+	reg_get_current_dfs_region(pdev, dfs_reg);
 
 	return QDF_STATUS_SUCCESS;
 }