Initial commit
Some checks failed
Build Kernel / Build all affected Kernels (push) Has been cancelled
Build all core packages / Build all core packages for selected target (push) Has been cancelled
Build and Push prebuilt tools container / Build and Push all prebuilt containers (push) Has been cancelled
Build Toolchains / Build Toolchains for each target (push) Has been cancelled
Build host tools / Build host tools for linux and macos based systems (push) Has been cancelled
Coverity scan build / Coverity x86/64 build (push) Has been cancelled
Some checks failed
Build Kernel / Build all affected Kernels (push) Has been cancelled
Build all core packages / Build all core packages for selected target (push) Has been cancelled
Build and Push prebuilt tools container / Build and Push all prebuilt containers (push) Has been cancelled
Build Toolchains / Build Toolchains for each target (push) Has been cancelled
Build host tools / Build host tools for linux and macos based systems (push) Has been cancelled
Coverity scan build / Coverity x86/64 build (push) Has been cancelled
This commit is contained in:
@@ -0,0 +1,40 @@
|
||||
From: Hauke Mehrtens <hauke@hauke-m.de>
|
||||
Date: Mon, 24 Feb 2020 00:00:00 +0100
|
||||
Subject: [PATCH] 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.
|
||||
|
||||
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.
|
||||
---
|
||||
net/wireless/core.c | 15 ---------------
|
||||
1 file changed, 15 deletions(-)
|
||||
|
||||
--- a/net/wireless/core.c
|
||||
+++ b/net/wireless/core.c
|
||||
@@ -654,21 +654,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
|
||||
Reference in New Issue
Block a user