From: Ben Greear <greearb@xxxxxxxxxxxxxxx> This check keeps mtk7996 from loading. If someone thinks they can get ADHOC to work, let them try it. If the kernel really needs to restrict some combination, then it should be done at time user attempts to actually use that combination, not at driver load. Signed-off-by: Ben Greear <greearb@xxxxxxxxxxxxxxx> --- net/wireless/core.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/net/wireless/core.c b/net/wireless/core.c index 74ca18833df1..9c8827266700 100644 --- a/net/wireless/core.c +++ b/net/wireless/core.c @@ -658,21 +658,6 @@ static int wiphy_verify_combinations(struct wiphy *wiphy) 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 -- 2.42.0