mirror of
https://github.com/openwrt/openwrt.git
synced 2025-01-01 11:36:49 +00:00
323e249ce8
This updates mac80211 to version 6.1.97-1. This code is based on Linux 6.1.97 and contains all fixes included in the upstream wireless subsystem from that kernel version. This includes many bugfixes and also some security fixes. The removed patches are already integrated in upstream Linux 6.1.97 or in backports. The following patches were integrated in upstream Linux: ath11k/0013-wifi-ath11k-synchronize-ath11k_mac_he_gi_to_nl80211_.patch ath11k/0035-wifi-ath11k-Use-platform_get_irq-to-get-the-interrup.patch ath11k/0036-wifi-ath11k-fix-SAC-bug-on-peer-addition-with-sta-ba.patch ath11k/0047-wifi-ath11k-fix-deinitialization-of-firmware-resourc.patch ath11k/0053-wifi-ath11k-fix-writing-to-unintended-memory-region.patch ath11k/0060-wifi-ath11k-Ignore-frags-from-uninitialized-peer-in-.patch ath11k/0065-wifi-ath11k-fix-tx-status-reporting-in-encap-offload.patch ath11k/0067-wifi-ath11k-Fix-SKB-corruption-in-REO-destination-ri.patch ath11k/0069-wifi-ath11k-fix-registration-of-6Ghz-only-phy-withou.patch ath11k/0080-wifi-ath11k-add-support-default-regdb-while-searchin.patch ath11k/0085-wifi-ath11k-fix-memory-leak-in-WMI-firmware-stats.patch ath11k/0086-wifi-ath11k-Add-missing-check-for-ioremap.patch ath11k/0096-wifi-ath11k-fix-boot-failure-with-one-MSI-vector.patch subsys/337-wifi-mac80211-fix-race-condition-on-enabling-fast-xm.patch The following patches were integrated in upstream backports: ath11k/901-wifi-ath11k-pci-fix-compilation-in-5.16-and-older.patch build/080-resv_start_op.patch build/110-backport_napi_build_skb.patch The following files are missing in backports, we do not have to remove them any more. Some were already missing before some were removed in this update: include/linux/cordic.h include/linux/crc8.h include/linux/eeprom_93cx6.h include/linux/wl12xx.h include/net/ieee80211.h backport-include/linux/bcm47xx_nvram.h include/linux/ath9k_platform.h include/net/bluetooth/ backports ships a dummy Mediatek wed header for older kernel versions. We backported the feature in our kernel, remove the dummy header: backport-include/linux/soc/mediatek/mtk_wed.h Remove header files for subsystems used form the mainline kernel: include/trace/events/qrtr.h include/net/rsi_91x.h backport-include/linux/platform_data/brcmnand.h Link: https://github.com/openwrt/openwrt/pull/15827 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
41 lines
1.4 KiB
Diff
41 lines
1.4 KiB
Diff
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
|
|
@@ -658,21 +658,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
|