aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJanusz Dziedzic <janusz.dziedzic@tieto.com>2014-04-08 07:38:43 -0400
committerJohn W. Linville <linville@tuxdriver.com>2014-04-09 13:55:55 -0400
commit4d76248013dbb1948429555208900a585b0f351d (patch)
tree6a5d0f0c89882281c250d5876e4f170682005e35
parent12cd43c6ed6da7bf7c5afbd74da6959cda6d056b (diff)
ath9k: Enable DFS only when ATH9K_DFS_CERTIFIED
Add DFS interface combination only when CONFIG_ATH9K_DFS_CERTIFIED is set. In other case user can run CAC/beaconing without proper handling of pulse events (without radar detection activated). Reported-by: Cedric Voncken <cedric.voncken@acksys.fr> Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/ath/ath9k/init.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c
index c0a4e866edca..cbbb02a6b13b 100644
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
@@ -670,6 +670,7 @@ static const struct ieee80211_iface_combination if_comb[] = {
670 .num_different_channels = 1, 670 .num_different_channels = 1,
671 .beacon_int_infra_match = true, 671 .beacon_int_infra_match = true,
672 }, 672 },
673#ifdef CONFIG_ATH9K_DFS_CERTIFIED
673 { 674 {
674 .limits = if_dfs_limits, 675 .limits = if_dfs_limits,
675 .n_limits = ARRAY_SIZE(if_dfs_limits), 676 .n_limits = ARRAY_SIZE(if_dfs_limits),
@@ -679,6 +680,7 @@ static const struct ieee80211_iface_combination if_comb[] = {
679 .radar_detect_widths = BIT(NL80211_CHAN_WIDTH_20_NOHT) | 680 .radar_detect_widths = BIT(NL80211_CHAN_WIDTH_20_NOHT) |
680 BIT(NL80211_CHAN_WIDTH_20), 681 BIT(NL80211_CHAN_WIDTH_20),
681 } 682 }
683#endif
682}; 684};
683 685
684static void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw) 686static void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw)