hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ath9k: resolve name collision in DFS detector 

set_domain() is already defined in /arch/arm/asm/domain.h

Signed-off-by: Zefir Kurtisi <zefir.kurtisi@neratec.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Zefir Kurtisi 2012-10-31 12:21:56 +01:00 committed by John W. Linville
parent 6a4b09f807
commit 259bcf87fb
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/wireless/ath/ath9k/dfs_pattern_detector.c
View File

@ -274,7 +274,7 @@ static bool dpd_set_domain(struct dfs_pattern_detector *dpd,
static struct dfs_pattern_detector default_dpd = { static struct dfs_pattern_detector default_dpd = {
.exit = dpd_exit, .exit = dpd_exit,
.set_domain = dpd_set_domain, .set_dfs_domain = dpd_set_domain,
.add_pulse = dpd_add_pulse, .add_pulse = dpd_add_pulse,
.region = NL80211_DFS_UNSET, .region = NL80211_DFS_UNSET,
}; };
@ -291,7 +291,7 @@ dfs_pattern_detector_init(enum nl80211_dfs_regions region)
*dpd = default_dpd; *dpd = default_dpd;
INIT_LIST_HEAD(&dpd->channel_detectors); INIT_LIST_HEAD(&dpd->channel_detectors);
if (dpd->set_domain(dpd, region)) if (dpd->set_dfs_domain(dpd, region))
return dpd; return dpd;
pr_err("Could not set DFS domain to %d. ", region); pr_err("Could not set DFS domain to %d. ", region);

4
drivers/net/wireless/ath/ath9k/dfs_pattern_detector.h
View File

@ -62,7 +62,7 @@ struct radar_detector_specs {
/** /**
* struct dfs_pattern_detector - DFS pattern detector * struct dfs_pattern_detector - DFS pattern detector
* @exit(): destructor * @exit(): destructor
* @set_domain(): set DFS domain, resets detector lines upon domain changes * @set_dfs_domain(): set DFS domain, resets detector lines upon domain changes
* @add_pulse(): add radar pulse to detector, returns true on detection * @add_pulse(): add radar pulse to detector, returns true on detection
* @region: active DFS region, NL80211_DFS_UNSET until set * @region: active DFS region, NL80211_DFS_UNSET until set
* @num_radar_types: number of different radar types * @num_radar_types: number of different radar types
@ -72,7 +72,7 @@ struct radar_detector_specs {
*/ */
struct dfs_pattern_detector { struct dfs_pattern_detector {
void (*exit)(struct dfs_pattern_detector *dpd); void (*exit)(struct dfs_pattern_detector *dpd);
bool (*set_domain)(struct dfs_pattern_detector *dpd, bool (*set_dfs_domain)(struct dfs_pattern_detector *dpd,
enum nl80211_dfs_regions region); enum nl80211_dfs_regions region);
bool (*add_pulse)(struct dfs_pattern_detector *dpd, bool (*add_pulse)(struct dfs_pattern_detector *dpd,
struct pulse_event *pe); struct pulse_event *pe);