diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2019-11-09 17:06:05 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2020-02-24 23:23:46 +0100 |
| commit | a9363914a393ac732cac6798d687cba167a99bad (patch) | |
| tree | ea7f7640e6fd4544cb41d36aa6017cdd3bbdcc72 | |
| parent | f2fc7a62c012c6fc58a87b87cf123463c684a685 (diff) | |
| download | upstream-a9363914a393ac732cac6798d687cba167a99bad.tar.gz upstream-a9363914a393ac732cac6798d687cba167a99bad.tar.bz2 upstream-a9363914a393ac732cac6798d687cba167a99bad.zip | |
mac80211: Allow IBSS mode and different beacon intervals
ath10k-ct supports the combination to select IBSS (ADHOC) mode and
different beacon intervals together. mac80211 does not like this
combination, but Ben says this is ok, so remove this check.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
| -rw-r--r-- | package/kernel/mac80211/patches/subsys/400-allow-ibss-mixed.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/package/kernel/mac80211/patches/subsys/400-allow-ibss-mixed.patch b/package/kernel/mac80211/patches/subsys/400-allow-ibss-mixed.patch new file mode 100644 index 0000000000..52200b6ecc --- /dev/null +++ b/package/kernel/mac80211/patches/subsys/400-allow-ibss-mixed.patch @@ -0,0 +1,29 @@ +ath10k-ct starting with version 5.2 allows the combination of +NL80211_IFTYPE_ADHOC and beacon_int_min_gcd in ath10k_10x_ct_if_comb +which triggers this warning. Ben told me that this is not a big problem +and we should ignore this. + +--- a/net/wireless/core.c ++++ b/net/wireless/core.c +@@ -613,21 +613,6 @@ static int wiphy_verify_combinations(str + c->limits[j].max > 1)) + return -EINVAL; + +- /* +- * This isn't well-defined right now. If you have an +- * IBSS interface, then its beacon interval may change +- * by joining other networks, and nothing prevents it +- * from doing that. +- * So technically we probably shouldn't even allow AP +- * and IBSS in the same interface, but it seems that +- * some drivers support that, possibly only with fixed +- * beacon intervals for IBSS. +- */ +- if (WARN_ON(types & BIT(NL80211_IFTYPE_ADHOC) && +- c->beacon_int_min_gcd)) { +- return -EINVAL; +- } +- + cnt += c->limits[j].max; + /* + * Don't advertise an unsupported type |