diff options
| author | Janusz Dziedzic <janusz.dziedzic@tieto.com> | 2013-10-14 09:06:05 (GMT) |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-10-18 18:03:54 (GMT) |
| commit | 379ce86e1f458281ca014a0053cf9350c7dca4bf (patch) | |
| tree | d5d0969760a10799f7facb3768038c2e9274932d /drivers/net | |
| parent | d265214b614aac62cdb8baed7ed3d77494cc9bdc (diff) | |
| download | linux-fsl-qoriq-379ce86e1f458281ca014a0053cf9350c7dca4bf.tar.xz | |
ath9k: dfs use CFG80211_CERTIFICATION_ONUS flag
Use CFG80211_CERTIFICATION_ONUS flag in the DFS
detector code. This is required as a preparation
for moving DFS detector code from ath9k to ath
module.
Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
Reviewed-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/dfs_pattern_detector.c | 3 | ||||
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/dfs_pattern_detector.h | 10 |
2 files changed, 3 insertions, 10 deletions
diff --git a/drivers/net/wireless/ath/ath9k/dfs_pattern_detector.c b/drivers/net/wireless/ath/ath9k/dfs_pattern_detector.c index b0dcd1b..c230ffc 100644 --- a/drivers/net/wireless/ath/ath9k/dfs_pattern_detector.c +++ b/drivers/net/wireless/ath/ath9k/dfs_pattern_detector.c @@ -299,6 +299,9 @@ dfs_pattern_detector_init(struct ath_common *common, { struct dfs_pattern_detector *dpd; + if (!config_enabled(CONFIG_CFG80211_CERTIFICATION_ONUS)) + return NULL; + dpd = kmalloc(sizeof(*dpd), GFP_KERNEL); if (dpd == NULL) return NULL; diff --git a/drivers/net/wireless/ath/ath9k/dfs_pattern_detector.h b/drivers/net/wireless/ath/ath9k/dfs_pattern_detector.h index 9c75297..dde2652 100644 --- a/drivers/net/wireless/ath/ath9k/dfs_pattern_detector.h +++ b/drivers/net/wireless/ath/ath9k/dfs_pattern_detector.h @@ -106,17 +106,7 @@ struct dfs_pattern_detector { * @param region: DFS domain to be used, can be NL80211_DFS_UNSET at creation * @return instance pointer on success, NULL otherwise */ -#if defined(CONFIG_ATH9K_DFS_CERTIFIED) extern struct dfs_pattern_detector * dfs_pattern_detector_init(struct ath_common *common, enum nl80211_dfs_regions region); -#else -static inline struct dfs_pattern_detector * -dfs_pattern_detector_init(struct ath_common *common, - enum nl80211_dfs_regions region) -{ - return NULL; -} -#endif /* CONFIG_ATH9K_DFS_CERTIFIED */ - #endif /* DFS_PATTERN_DETECTOR_H */ |