From c4bbc1e21df783689dd4aaed3ef021e802f1043e Mon Sep 17 00:00:00 2001
From: Florian Maurer <f.maurer@outlook.de>
Date: Tue, 9 Jan 2024 15:55:08 +0100
Subject: [PATCH] modules: update openwrt (#3152)

3bf602d740 mac80211: avoid crashing on invalid band info
d4a21d75a9 mediatek: GL-MT6000: Add missing LED state definitions
0cd6b3fd0c linux/modules: remove deprecated module
40cfdf5ffe kernel: bump 5.15 to 5.15.146
6e39d2426b ramips: add support for D-Link COVR-X1860 A1
af7ef781ac ramips: add encrypted SGE factory image for D-Link devices
67d998e25d kernel: bump 5.15 to 5.15.145
b54f7105df firmware-utils: move patch to maintaince branch
34e30fb53a firmware-utils: bump to latest openwrt-23.05
e61d651053 ramips: correct the PCIe port number for Unielec u7621-01
80ef582dee rockchip: configure eth pad driver strength for orangepi r1 plus lts
9cd589bd79 ramips: lzma-loader: use default uart for rt305x
2216b10ebb ramips: lzma-loader: use proper register names
76f7dd3312 ramips: lzma-loader: use virtual memory segments for uart base address
23506e7789 raimps: mtk_eth_soc: drop rst_esw from ESW driver
0128d860a0 ramips: dts: mt7628an: reset FE and ESW cores together
ee4a042483 ramips: dts: rt5350: reset FE and ESW cores together
4e1bf2a50c ramips: dts: rt3050: reset FE and ESW cores together
88501f82f5 ramips: dts: rt3352: reset FE and ESW cores together
289515e003 ramips: mtk_eth_soc: wait longer after FE core reset to settle
8ce87267ba ramips: mtk_eth_soc: allow multiple resets
3aec71a176 mac80211: add missing newline for "min_tx_power"
c6425bb525 kernel: delete stray linux 6.1 patch
49bde57679 kernel: fix bridge proxyarp issue with some broken DHCP clients

Signed-off-by: Florian Maurer <f.maurer@outlook.de>
---
 modules                                       |  2 +-
 ...-avoid-crashing-on-invalid-band-info.patch | 39 -------------------
 2 files changed, 1 insertion(+), 40 deletions(-)
 delete mode 100644 patches/openwrt/0007-mac80211-avoid-crashing-on-invalid-band-info.patch

diff --git a/modules b/modules
index d01c0042b..b53d3892d 100644
--- a/modules
+++ b/modules
@@ -2,7 +2,7 @@ GLUON_FEEDS='gluon packages routing'
 
 OPENWRT_REPO=https://github.com/openwrt/openwrt.git
 OPENWRT_BRANCH=openwrt-23.05
-OPENWRT_COMMIT=51881b2eb910d4adc6109b8d5abf0b23635a92ff
+OPENWRT_COMMIT=3bf602d740765db52d96733d172093a4b9a69915
 
 PACKAGES_GLUON_REPO=https://github.com/freifunk-gluon/packages.git
 PACKAGES_GLUON_COMMIT=53ea3b89771fc7d7a80f1800ce25e98dfe1633aa
diff --git a/patches/openwrt/0007-mac80211-avoid-crashing-on-invalid-band-info.patch b/patches/openwrt/0007-mac80211-avoid-crashing-on-invalid-band-info.patch
deleted file mode 100644
index 3ebb462e0..000000000
--- a/patches/openwrt/0007-mac80211-avoid-crashing-on-invalid-band-info.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From: David Bauer <mail@david-bauer.net>
-Date: Thu, 30 Nov 2023 07:32:52 +0100
-Subject: mac80211: avoid crashing on invalid band info
-
-Frequent crashes have been observed on MT7916 based platforms. While the
-root of these crashes are currently unknown, they happen when decoding
-rate information of connected STAs in AP mode. The rate-information is
-associated with a band which is not available on the PHY.
-
-Check for this condition in order to avoid crashing the whole system.
-This patch should be removed once the roout cause has been found and
-fixed.
-
-Link: https://github.com/freifunk-gluon/gluon/issues/2980
-
-Signed-off-by: David Bauer <mail@david-bauer.net>
-
-diff --git a/package/kernel/mac80211/patches/subsys/780-avoid-crashing-missing-band.patch b/package/kernel/mac80211/patches/subsys/780-avoid-crashing-missing-band.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..1847b2fe8defd67ec17a1b760ce03c0db1065f8c
---- /dev/null
-+++ b/package/kernel/mac80211/patches/subsys/780-avoid-crashing-missing-band.patch
-@@ -0,0 +1,16 @@
-+--- a/net/mac80211/sta_info.c
-++++ b/net/mac80211/sta_info.c
-+@@ -2422,6 +2422,13 @@ static void sta_stats_decode_rate(struct
-+ 
-+ 		sband = local->hw.wiphy->bands[band];
-+ 
-++		if (!sband) {
-++			wiphy_debug(local->hw.wiphy,
-++				    "Invalid band %d\n",
-++				    band);
-++			break;
-++		}
-++
-+ 		if (WARN_ON_ONCE(!sband->bitrates))
-+ 			break;
-+ 
-- 
GitLab