Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 259bcf87 authored by Zefir Kurtisi's avatar Zefir Kurtisi Committed by John W. Linville
Browse files

ath9k: resolve name collision in DFS detector 



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

Signed-off-by: default avatarZefir Kurtisi <zefir.kurtisi@neratec.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 6a4b09f8

drivers/net/wireless/ath/ath9k/dfs_pattern_detector.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

drivers/net/wireless/ath/ath9k/dfs_pattern_detector.h

+2 −2
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ struct radar_detector_specs { 
/**

 * struct dfs_pattern_detector - DFS pattern detector

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

 * @region: active DFS region, NL80211_DFS_UNSET until set

 * @num_radar_types: number of different radar types
@@ -72,7 +72,7 @@ struct radar_detector_specs { 
 */

struct dfs_pattern_detector {

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

	bool (*add_pulse)(struct dfs_pattern_detector *dpd,

			  struct pulse_event *pe);