From 94731839c8ccea494e996d8548c32ddf48a0a5b3 Mon Sep 17 00:00:00 2001
From: David Bauer <mail@david-bauer.net>
Date: Fri, 31 Mar 2023 13:59:26 +0200
Subject: [PATCH] modules: update openwrt
c2331038b2 kernel: remove obsolete netfilter tcp window size check bypass patch
4ae854d055 mac80211, mt76: add fixes for recently discovered security issues
b573a785e0 ncm: add error check and retry mechanism for gcom call
f61c5cf76b kernel: bump 5.10 to 5.10.176
a4212b77c0 kernel: bump 5.10 to 5.10.175
6b19d24254 kernel: bump 5.10 to 5.10.174
24d84a13a4 kernel: bump 5.10 to 5.10.173
36bf158b47 kernel: tcindex classifier has been retired
999cb9574f x86: fix deprecated CONFIG_MICROCODE_OLD_INTERACE
a88c65507d kernel: bump 5.10 to 5.10.172
cb91aa4b29 kernel: bump 5.10 to 5.10.170
26cc831e44 kernel: bump 5.10 to 5.10.169
28e5045f3a bcm4908: include usbport trigger
836e3d1e5e bcm4908: backport v6.4 pending DTS changes
b7c031d933 ipq40xx: Linksys MR8300: fix the USB port power
0170bc1af1 ramips: mt7621: enable lzma-loader for AFOUNDRY EW1200
96e3fee7ad ramips: fix 5g mac for TOTOLINK X5000R
f5db04e8ea ramips: add support for Mercusys MR70X
c58959dc45 firmware-utils: tplink-safeloader: add Mercusys MR70X
c1bfb704b1 ramips: fix Archer AX23 WiFi MAC address conflict
3c6692ba03 ramips: add support for TP-Link Archer AX23 v1
a507243bfe firmware-utils: tplink-safeloader: add TP-Link Archer AX23 v1
788a0cf15c mpc85xx: add support for Watchguard Firebox T10
---
modules | 2 +-
...1-make-DSA-images-swconfig-upgradable.patch | 18 +++++++++---------
...-wake-up-calls-Android-bug-workaround.patch | 2 +-
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/modules b/modules
index 32252cc67..330ccde4e 100644
--- a/modules
+++ b/modules
@@ -2,7 +2,7 @@ GLUON_FEEDS='packages routing gluon'
OPENWRT_REPO=https://github.com/openwrt/openwrt.git
OPENWRT_BRANCH=openwrt-22.03
-OPENWRT_COMMIT=0a32f66fea95cabc5d21c945678d918bed8cca47
+OPENWRT_COMMIT=c2331038b2577cfeb6d34b3b6a812c6c1cf7ba5f
PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git
PACKAGES_PACKAGES_BRANCH=openwrt-22.03
diff --git a/patches/openwrt/0004-ramips-mt7621-make-DSA-images-swconfig-upgradable.patch b/patches/openwrt/0004-ramips-mt7621-make-DSA-images-swconfig-upgradable.patch
index 184dcc1a7..b1a27bce6 100644
--- a/patches/openwrt/0004-ramips-mt7621-make-DSA-images-swconfig-upgradable.patch
+++ b/patches/openwrt/0004-ramips-mt7621-make-DSA-images-swconfig-upgradable.patch
@@ -3,10 +3,10 @@ Date: Sun, 5 Jun 2022 23:43:38 +0200
Subject: ramips-mt7621: make DSA images swconfig upgradable
diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk
-index 961f8a3b7514a3658f8d4795c136d5069830126f..89329729b1c035642311363e8aad46ba5b8d4d22 100644
+index 1fb806043460895182159504f48708ae717379cb..3c26f75b9a1cbc397154b3eef4b29ec7d3d7f0db 100644
--- a/target/linux/ramips/image/mt7621.mk
+++ b/target/linux/ramips/image/mt7621.mk
-@@ -179,7 +179,6 @@ endef
+@@ -180,7 +180,6 @@ endef
TARGET_DEVICES += asiarf_ap7621-nv1
define Device/asus_rt-ac57u
@@ -14,7 +14,7 @@ index 961f8a3b7514a3658f8d4795c136d5069830126f..89329729b1c035642311363e8aad46ba
DEVICE_VENDOR := ASUS
DEVICE_MODEL := RT-AC57U
DEVICE_ALT0_VENDOR := ASUS
-@@ -426,7 +425,6 @@ endef
+@@ -427,7 +426,6 @@ endef
TARGET_DEVICES += dlink_dir-853-r1
define Device/dlink_dir-860l-b1
@@ -22,7 +22,7 @@ index 961f8a3b7514a3658f8d4795c136d5069830126f..89329729b1c035642311363e8aad46ba
$(Device/seama-lzma-loader)
SEAMA_SIGNATURE := wrgac13_dlink.2013gui_dir860lb
IMAGE_SIZE := 16064k
-@@ -1233,7 +1231,6 @@ endef
+@@ -1247,7 +1245,6 @@ endef
TARGET_DEVICES += mts_wg430223
define Device/netgear_ex6150
@@ -30,7 +30,7 @@ index 961f8a3b7514a3658f8d4795c136d5069830126f..89329729b1c035642311363e8aad46ba
$(Device/uimage-lzma-loader)
DEVICE_VENDOR := NETGEAR
DEVICE_MODEL := EX6150
-@@ -1246,7 +1243,6 @@ endef
+@@ -1260,7 +1257,6 @@ endef
TARGET_DEVICES += netgear_ex6150
define Device/netgear_sercomm_nand
@@ -38,7 +38,7 @@ index 961f8a3b7514a3658f8d4795c136d5069830126f..89329729b1c035642311363e8aad46ba
$(Device/uimage-lzma-loader)
BLOCKSIZE := 128k
PAGESIZE := 2048
-@@ -1429,7 +1425,6 @@ endef
+@@ -1443,7 +1439,6 @@ endef
TARGET_DEVICES += netgear_wax202
define Device/netgear_wndr3700-v5
@@ -46,7 +46,7 @@ index 961f8a3b7514a3658f8d4795c136d5069830126f..89329729b1c035642311363e8aad46ba
$(Device/netgear_sercomm_nor)
$(Device/uimage-lzma-loader)
IMAGE_SIZE := 15232k
-@@ -1754,7 +1749,6 @@ endef
+@@ -1780,7 +1775,6 @@ endef
TARGET_DEVICES += tplink_tl-wpa8631p-v3
define Device/ubnt_edgerouter_common
@@ -54,7 +54,7 @@ index 961f8a3b7514a3658f8d4795c136d5069830126f..89329729b1c035642311363e8aad46ba
$(Device/uimage-lzma-loader)
DEVICE_VENDOR := Ubiquiti
IMAGE_SIZE := 256768k
-@@ -2170,7 +2164,6 @@ endef
+@@ -2196,7 +2190,6 @@ endef
TARGET_DEVICES += zbtlink_zbt-wg2626
define Device/zbtlink_zbt-wg3526-16m
@@ -62,7 +62,7 @@ index 961f8a3b7514a3658f8d4795c136d5069830126f..89329729b1c035642311363e8aad46ba
$(Device/uimage-lzma-loader)
IMAGE_SIZE := 16064k
DEVICE_VENDOR := Zbtlink
-@@ -2183,7 +2176,6 @@ endef
+@@ -2209,7 +2202,6 @@ endef
TARGET_DEVICES += zbtlink_zbt-wg3526-16m
define Device/zbtlink_zbt-wg3526-32m
diff --git a/patches/openwrt/0007-kernel-bridge-Implement-MLD-Querier-wake-up-calls-Android-bug-workaround.patch b/patches/openwrt/0007-kernel-bridge-Implement-MLD-Querier-wake-up-calls-Android-bug-workaround.patch
index 987050ac5..ec9641c03 100644
--- a/patches/openwrt/0007-kernel-bridge-Implement-MLD-Querier-wake-up-calls-Android-bug-workaround.patch
+++ b/patches/openwrt/0007-kernel-bridge-Implement-MLD-Querier-wake-up-calls-Android-bug-workaround.patch
@@ -208,7 +208,7 @@ index 0000000000000000000000000000000000000000..e3da684dc950ea4c226705d27b23b047
+
+ int system_bridge_addif(struct device *bridge, struct device *dev)
diff --git a/target/linux/generic/config-5.10 b/target/linux/generic/config-5.10
-index 4a17e635b2b4ff62e362c1815723aeaf30b1b443..9b11be8fcd59836a0c6351babae78343658a80f2 100644
+index a348d4821ecef796c8c2b983a969b7becb7ae334..dad7baabe69f53ca9afeff8e9392397dd9dc35aa 100644
--- a/target/linux/generic/config-5.10
+++ b/target/linux/generic/config-5.10
@@ -738,6 +738,7 @@ CONFIG_BRIDGE=y
--
GitLab