diff options
| author | Zefir Kurtisi <zefir.kurtisi@neratec.com> | 2012-10-31 12:21:56 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-11-14 14:55:32 -0500 |
| commit | 259bcf87fb51fb80185cf54fac7f00da56a80ac4 (patch) | |
| tree | f41b3d7d9359cc59afd180fc329c1e28b9eb7bef /drivers/net/wireless/ath/ath9k/dfs_pattern_detector.c | |
| parent | 6a4b09f807afab788b58b529c4a9d6dc27cc6933 (diff) | |
| download | blackbird-obmc-linux-259bcf87fb51fb80185cf54fac7f00da56a80ac4.tar.gz blackbird-obmc-linux-259bcf87fb51fb80185cf54fac7f00da56a80ac4.zip | |
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>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/dfs_pattern_detector.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/dfs_pattern_detector.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath9k/dfs_pattern_detector.c b/drivers/net/wireless/ath/ath9k/dfs_pattern_detector.c index ea2a6cf7ef23..f66da35d57ad 100644 --- a/drivers/net/wireless/ath/ath9k/dfs_pattern_detector.c +++ b/drivers/net/wireless/ath/ath9k/dfs_pattern_detector.c @@ -274,7 +274,7 @@ static bool dpd_set_domain(struct dfs_pattern_detector *dpd, static struct dfs_pattern_detector default_dpd = { .exit = dpd_exit, - .set_domain = dpd_set_domain, + .set_dfs_domain = dpd_set_domain, .add_pulse = dpd_add_pulse, .region = NL80211_DFS_UNSET, }; @@ -291,7 +291,7 @@ dfs_pattern_detector_init(enum nl80211_dfs_regions region) *dpd = default_dpd; INIT_LIST_HEAD(&dpd->channel_detectors); - if (dpd->set_domain(dpd, region)) + if (dpd->set_dfs_domain(dpd, region)) return dpd; pr_err("Could not set DFS domain to %d. ", region); |
