56 lines
1.6 KiB
Diff
56 lines
1.6 KiB
Diff
From: Felix Fietkau <nbd@nbd.name>
|
|
Date: Fri, 22 Jan 2016 01:05:56 +0100
|
|
Subject: [PATCH] ath9k: do not limit the number of DFS interfaces to 1
|
|
|
|
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
---
|
|
|
|
--- a/drivers/net/wireless/ath/ath9k/init.c
|
|
+++ b/drivers/net/wireless/ath/ath9k/init.c
|
|
@@ -751,14 +751,6 @@ static const struct ieee80211_iface_comb
|
|
|
|
#endif /* CPTCFG_ATH9K_CHANNEL_CONTEXT */
|
|
|
|
-static const struct ieee80211_iface_limit if_dfs_limits[] = {
|
|
- { .max = 1, .types = BIT(NL80211_IFTYPE_AP) |
|
|
-#ifdef CPTCFG_MAC80211_MESH
|
|
- BIT(NL80211_IFTYPE_MESH_POINT) |
|
|
-#endif
|
|
- BIT(NL80211_IFTYPE_ADHOC) },
|
|
-};
|
|
-
|
|
static const struct ieee80211_iface_combination if_comb[] = {
|
|
{
|
|
.limits = if_limits,
|
|
@@ -766,6 +758,11 @@ static const struct ieee80211_iface_comb
|
|
.max_interfaces = 2048,
|
|
.num_different_channels = 1,
|
|
.beacon_int_infra_match = true,
|
|
+#ifdef CPTCFG_ATH9K_DFS_CERTIFIED
|
|
+ .radar_detect_widths = BIT(NL80211_CHAN_WIDTH_20_NOHT) |
|
|
+ BIT(NL80211_CHAN_WIDTH_20) |
|
|
+ BIT(NL80211_CHAN_WIDTH_40),
|
|
+#endif
|
|
},
|
|
{
|
|
.limits = wds_limits,
|
|
@@ -774,18 +771,6 @@ static const struct ieee80211_iface_comb
|
|
.num_different_channels = 1,
|
|
.beacon_int_infra_match = true,
|
|
},
|
|
-#ifdef CPTCFG_ATH9K_DFS_CERTIFIED
|
|
- {
|
|
- .limits = if_dfs_limits,
|
|
- .n_limits = ARRAY_SIZE(if_dfs_limits),
|
|
- .max_interfaces = 1,
|
|
- .num_different_channels = 1,
|
|
- .beacon_int_infra_match = true,
|
|
- .radar_detect_widths = BIT(NL80211_CHAN_WIDTH_20_NOHT) |
|
|
- BIT(NL80211_CHAN_WIDTH_20) |
|
|
- BIT(NL80211_CHAN_WIDTH_40),
|
|
- }
|
|
-#endif
|
|
};
|
|
|
|
#ifdef CPTCFG_ATH9K_CHANNEL_CONTEXT
|