treewide: fix replace nbd@openwrt.org with nbd@nbd.name
[openwrt.org/openwrt.git] / package / kernel / mac80211 / patches / 311-ath9k-do-not-limit-the-number-of-DFS-interfaces-to-1.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
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
 
comments