1 From: Hauke Mehrtens <hauke@hauke-m.de>
2 Date: Mon, 24 Feb 2020 00:00:00 +0100
3 Subject: [PATCH] mac80211: Allow IBSS mode and different beacon intervals
5 ath10k-ct supports the combination to select IBSS (ADHOC) mode and
6 different beacon intervals together. mac80211 does not like this
7 combination, but Ben says this is ok, so remove this check.
9 ath10k-ct starting with version 5.2 allows the combination of
10 NL80211_IFTYPE_ADHOC and beacon_int_min_gcd in ath10k_10x_ct_if_comb
11 which triggers this warning. Ben told me that this is not a big problem
12 and we should ignore this.
14 net/wireless/core.c | 15 ---------------
15 1 file changed, 15 deletions(-)
17 --- a/net/wireless/core.c
18 +++ b/net/wireless/core.c
19 @@ -625,21 +625,6 @@ static int wiphy_verify_combinations(str
20 c->limits[j].max > 1))
24 - * This isn't well-defined right now. If you have an
25 - * IBSS interface, then its beacon interval may change
26 - * by joining other networks, and nothing prevents it
28 - * So technically we probably shouldn't even allow AP
29 - * and IBSS in the same interface, but it seems that
30 - * some drivers support that, possibly only with fixed
31 - * beacon intervals for IBSS.
33 - if (WARN_ON(types & BIT(NL80211_IFTYPE_ADHOC) &&
34 - c->beacon_int_min_gcd)) {
38 cnt += c->limits[j].max;
40 * Don't advertise an unsupported type