A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-31 12:10:52 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacmn: Fix compile error

Browse source 
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
This commit is contained in:
Liangwei Dong 2017-10-14 03:38:15 -04:00 • committed by snandini
commit 8b6b17b592
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
umac/regulatory/core/src/reg_services.c
View file

@ -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;

2
umac/regulatory/core/src/reg_services.h
View file

@ -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,

2
umac/regulatory/dispatcher/src/wlan_reg_services_api.c
View file

@ -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;
}