mirror of
https://github.com/openwrt/openwrt.git
synced 2025-01-16 09:50:26 +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>
55 lines
2.0 KiB
Diff
55 lines
2.0 KiB
Diff
From: Felix Fietkau <nbd@nbd.name>
|
|
Date: Fri, 2 Dec 2022 17:01:46 +0100
|
|
Subject: [PATCH] wifi: mac80211: remove mesh forwarding congestion check
|
|
|
|
Now that all drivers use iTXQ, it does not make sense to check to drop
|
|
tx forwarding packets when the driver has stopped the queues.
|
|
fq_codel will take care of dropping packets when the queues fill up
|
|
|
|
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
---
|
|
|
|
--- a/net/mac80211/debugfs_netdev.c
|
|
+++ b/net/mac80211/debugfs_netdev.c
|
|
@@ -603,8 +603,6 @@ IEEE80211_IF_FILE(fwded_mcast, u.mesh.ms
|
|
IEEE80211_IF_FILE(fwded_unicast, u.mesh.mshstats.fwded_unicast, DEC);
|
|
IEEE80211_IF_FILE(fwded_frames, u.mesh.mshstats.fwded_frames, DEC);
|
|
IEEE80211_IF_FILE(dropped_frames_ttl, u.mesh.mshstats.dropped_frames_ttl, DEC);
|
|
-IEEE80211_IF_FILE(dropped_frames_congestion,
|
|
- u.mesh.mshstats.dropped_frames_congestion, DEC);
|
|
IEEE80211_IF_FILE(dropped_frames_no_route,
|
|
u.mesh.mshstats.dropped_frames_no_route, DEC);
|
|
|
|
@@ -740,7 +738,6 @@ static void add_mesh_stats(struct ieee80
|
|
MESHSTATS_ADD(fwded_frames);
|
|
MESHSTATS_ADD(dropped_frames_ttl);
|
|
MESHSTATS_ADD(dropped_frames_no_route);
|
|
- MESHSTATS_ADD(dropped_frames_congestion);
|
|
#undef MESHSTATS_ADD
|
|
}
|
|
|
|
--- a/net/mac80211/ieee80211_i.h
|
|
+++ b/net/mac80211/ieee80211_i.h
|
|
@@ -333,7 +333,6 @@ struct mesh_stats {
|
|
__u32 fwded_frames; /* Mesh total forwarded frames */
|
|
__u32 dropped_frames_ttl; /* Not transmitted since mesh_ttl == 0*/
|
|
__u32 dropped_frames_no_route; /* Not transmitted, no route found */
|
|
- __u32 dropped_frames_congestion;/* Not forwarded due to congestion */
|
|
};
|
|
|
|
#define PREQ_Q_F_START 0x1
|
|
--- a/net/mac80211/rx.c
|
|
+++ b/net/mac80211/rx.c
|
|
@@ -2932,11 +2932,6 @@ ieee80211_rx_h_mesh_fwding(struct ieee80
|
|
return RX_CONTINUE;
|
|
|
|
ac = ieee802_1d_to_ac[skb->priority];
|
|
- q = sdata->vif.hw_queue[ac];
|
|
- if (ieee80211_queue_stopped(&local->hw, q)) {
|
|
- IEEE80211_IFSTA_MESH_CTR_INC(ifmsh, dropped_frames_congestion);
|
|
- return RX_DROP_MONITOR;
|
|
- }
|
|
skb_set_queue_mapping(skb, ac);
|
|
|
|
if (!--mesh_hdr->ttl) {
|