config.yml: update 21.02 baseline from RC2->GA

Signed-off-by: John Crispin <john@phrozen.org>
2025-10-31 18:38:10 +00:00 · 2021-09-04 06:37:52 +02:00
parent a6256fb1f9
commit 1e7efc68a8
81 changed files with 1203 additions and 4217 deletions
--- a/backports/0001-build-build-kernel-image-before-building-modules-pac.patch
+++ b/backports/0001-build-build-kernel-image-before-building-modules-pac.patch
@@ -1,7 +1,7 @@
-From 08be0915e06fb6f2b62c022099e82bb4d849a8c6 Mon Sep 17 00:00:00 2001
+From c51ac602aff1a9b0093687fe39164a3b895fd4a2 Mon Sep 17 00:00:00 2001
 From: Felix Fietkau <nbd@nbd.name>
 Date: Thu, 22 Oct 2020 10:29:34 +0200
-Subject: [PATCH 1/9] build: build kernel image before building
+Subject: [PATCH 01/27] build: build kernel image before building
 modules/packages
 This is needed for linux 5.10, where modules.builtin is generated from
@@ -13,10 +13,10 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 1 file changed, 3 insertions(+), 3 deletions(-)
 diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk
-index e5a0ba367b..b069c1e671 100644
+index 3aa1baa761..c02e0d34ca 100644
 --- a/include/kernel-defaults.mk
 +++ b/include/kernel-defaults.mk
-@@ -113,7 +113,7 @@ endef
+@@ -115,7 +115,7 @@ endef
 define Kernel/CompileModules/Default
 	rm -f $(LINUX_DIR)/vmlinux $(LINUX_DIR)/System.map
@@ -25,7 +25,7 @@ index e5a0ba367b..b069c1e671 100644
 endef
 OBJCOPY_STRIP = -R .reginfo -R .notes -R .note -R .comment -R .mdebug -R .note.gnu.build-id
-@@ -137,7 +137,7 @@ endef
+@@ -139,7 +139,7 @@ endef
 define Kernel/CompileImage/Default
 	rm -f $(TARGET_DIR)/init
@@ -34,7 +34,7 @@ index e5a0ba367b..b069c1e671 100644
 	$(call Kernel/CopyImage)
 endef
-@@ -147,7 +147,7 @@ define Kernel/CompileImage/Initramfs
+@@ -149,7 +149,7 @@ define Kernel/CompileImage/Initramfs
 	$(CP) $(GENERIC_PLATFORM_DIR)/other-files/init $(TARGET_DIR)/init
 	$(if $(SOURCE_DATE_EPOCH),touch -hcd "@$(SOURCE_DATE_EPOCH)" $(TARGET_DIR)/init)
 	rm -rf $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)/usr/initramfs_data.cpio*
--- a/backports/0002-build-fix-build-with-CONFIG_STRIP_KERNEL_EXPORTS.patch
+++ b/backports/0002-build-fix-build-with-CONFIG_STRIP_KERNEL_EXPORTS.patch
@@ -1,7 +1,7 @@
-From 6d2e2ff2778ca6360af9bf1e712d7ff276afa54b Mon Sep 17 00:00:00 2001
+From 6c50e27b166b30c0b3f7b730717ab4b7f446e4d0 Mon Sep 17 00:00:00 2001
 From: Felix Fietkau <nbd@nbd.name>
 Date: Wed, 17 Feb 2021 13:49:14 +0100
-Subject: [PATCH 2/9] build: fix build with CONFIG_STRIP_KERNEL_EXPORTS
+Subject: [PATCH 02/27] build: fix build with CONFIG_STRIP_KERNEL_EXPORTS
 Only use symtab.h on the final kernel link
@@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 1 file changed, 3 insertions(+), 3 deletions(-)
 diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk
-index b069c1e671..93eed54ae1 100644
+index c02e0d34ca..f9316fc3f9 100644
 --- a/include/kernel-defaults.mk
 +++ b/include/kernel-defaults.mk
@@ -3,7 +3,7 @@
@@ -23,7 +23,7 @@ index b069c1e671..93eed54ae1 100644
 	EXTRA_LDSFLAGS="-I$(KERNEL_BUILD_DIR) -include symtab.h"
 endif
-@@ -137,7 +137,7 @@ endef
+@@ -139,7 +139,7 @@ endef
 define Kernel/CompileImage/Default
 	rm -f $(TARGET_DIR)/init
@@ -32,7 +32,7 @@ index b069c1e671..93eed54ae1 100644
 	$(call Kernel/CopyImage)
 endef
-@@ -147,7 +147,7 @@ define Kernel/CompileImage/Initramfs
+@@ -149,7 +149,7 @@ define Kernel/CompileImage/Initramfs
 	$(CP) $(GENERIC_PLATFORM_DIR)/other-files/init $(TARGET_DIR)/init
 	$(if $(SOURCE_DATE_EPOCH),touch -hcd "@$(SOURCE_DATE_EPOCH)" $(TARGET_DIR)/init)
 	rm -rf $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)/usr/initramfs_data.cpio*
--- a/backports/0003-kernel-add-linux-5.10-support.patch
+++ b/backports/0003-kernel-add-linux-5.10-support.patch
@@ -1,7 +1,7 @@
-From 0f37bb5919d96aaca7b0d06b56d37dabba87b190 Mon Sep 17 00:00:00 2001
+From 369794a62050fadc47b617acb29e19d6f536fe3f Mon Sep 17 00:00:00 2001
 From: Felix Fietkau <nbd@nbd.name>
 Date: Sat, 24 Oct 2020 21:14:16 +0200
-Subject: [PATCH 01/45] kernel: add linux 5.10 support
+Subject: [PATCH 03/27] kernel: add linux 5.10 support
 Signed-off-by: Felix Fietkau <nbd@nbd.name>
 ---
@@ -422,7 +422,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 create mode 100644 target/linux/generic/pending-5.10/920-mangle_bootargs.patch
 diff --git a/include/image-commands.mk b/include/image-commands.mk
-index 51e745958e..bddbed6052 100644
+index 4d54a14ba4..2c917d613e 100644
 --- a/include/image-commands.mk
 +++ b/include/image-commands.mk
@@ -200,11 +200,12 @@ define Build/fit
@@ -744,7 +744,7 @@ index b46fcebc08..e2bb1d0681 100644
   AUTOLOAD:=$(call AutoProbe,$(notdir $(NFT_CORE-m)))
   KCONFIG:= \
 diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk
-index d050165df3..3dd20a0696 100644
+index 93f99f7cbe..4191590ba7 100644
 --- a/package/kernel/linux/modules/usb.mk
 +++ b/package/kernel/linux/modules/usb.mk
@@ -1387,7 +1387,7 @@ define KernelPackage/usb-net-cdc-ncm
@@ -12418,10 +12418,10 @@ index 0000000000..4eb5607f17
 +# CONFIG_ZSMALLOC is not set
 +# CONFIG_ZX_TDM is not set
 diff --git a/target/linux/generic/config-5.4 b/target/linux/generic/config-5.4
-index 91dc0b0f49..d3e9325f71 100644
+index 50e627297e..da0e2e2186 100644
 --- a/target/linux/generic/config-5.4
 +++ b/target/linux/generic/config-5.4
-@@ -3273,6 +3273,7 @@ CONFIG_MTD_ROOTFS_ROOT_DEV=y
+@@ -3287,6 +3287,7 @@ CONFIG_MTD_ROOTFS_ROOT_DEV=y
 CONFIG_MTD_SPI_NOR_USE_4K_SECTORS_LIMIT=4096
 CONFIG_MTD_SPLIT=y
 # CONFIG_MTD_SPLIT_BCM_WFI_FW is not set
--- a/backports/0004-mediatek-update-to-latest-trunk-version.patch
+++ b/backports/0004-mediatek-update-to-latest-trunk-version.patch
@@ -1,7 +1,7 @@
-From 583b54e2f10ee14b5756d7035e641f7a1bb3095c Mon Sep 17 00:00:00 2001
+From 29f60bb65745d63e7d8cce273bd3f773fda251ff Mon Sep 17 00:00:00 2001
 From: Felix Fietkau <nbd@nbd.name>
 Date: Thu, 9 Apr 2020 09:53:24 +0200
-Subject: [PATCH 01/43] mediatek: update to latest trunk version
+Subject: [PATCH 04/27] mediatek: update to latest trunk version
 Signed-off-by: Felix Fietkau <nbd@nbd.name>
 ---
@@ -101957,7 +101957,7 @@ diff --git a/target/linux/mediatek/mt7622/config-5.4 b/target/linux/mediatek/mt7
 similarity index 67%
 rename from target/linux/mediatek/mt7622/config-5.4
 rename to target/linux/mediatek/mt7622/config-5.10
-index b873bdc40c..2d7f82ce23 100644
+index 282cd0bab5..e6696bd50a 100644
 --- a/target/linux/mediatek/mt7622/config-5.4
 +++ b/target/linux/mediatek/mt7622/config-5.10
@@ -1,59 +1,6 @@
@@ -102116,7 +102116,7 @@ index b873bdc40c..2d7f82ce23 100644
 # CONFIG_FUJITSU_ERRATUM_010001 is not set
 CONFIG_FW_LOADER_PAGED_BUF=y
 CONFIG_GENERIC_ALLOCATOR=y
-@@ -267,102 +201,19 @@ CONFIG_GLOB=y
+@@ -267,103 +201,20 @@ CONFIG_GLOB=y
 CONFIG_GPIOLIB=y
 CONFIG_GRO_CELLS=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
@@ -102184,6 +102184,7 @@ index b873bdc40c..2d7f82ce23 100644
 -CONFIG_HAVE_UID16=y
 -CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
 CONFIG_HOLES_IN_ZONE=y
 # CONFIG_HW_RANDOM_MTK is not set
 CONFIG_HZ=250
 CONFIG_HZ_250=y
 -CONFIG_I2C=y
@@ -102219,7 +102220,7 @@ index b873bdc40c..2d7f82ce23 100644
 CONFIG_IO_URING=y
 CONFIG_IRQCHIP=y
 CONFIG_IRQ_DOMAIN=y
-@@ -370,9 +221,10 @@ CONFIG_IRQ_DOMAIN_HIERARCHY=y
+@@ -371,9 +222,10 @@ CONFIG_IRQ_DOMAIN_HIERARCHY=y
 CONFIG_IRQ_FORCED_THREADING=y
 CONFIG_IRQ_TIME_ACCOUNTING=y
 CONFIG_IRQ_WORK=y
@@ -102231,7 +102232,7 @@ index b873bdc40c..2d7f82ce23 100644
 CONFIG_LOCK_DEBUGGING_SUPPORT=y
 CONFIG_LOCK_SPIN_ON_OWNER=y
 CONFIG_LZO_COMPRESS=y
-@@ -380,21 +232,25 @@ CONFIG_LZO_DECOMPRESS=y
+@@ -381,21 +233,25 @@ CONFIG_LZO_DECOMPRESS=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_MDIO_BUS=y
 CONFIG_MDIO_DEVICE=y
@@ -102259,7 +102260,7 @@ index b873bdc40c..2d7f82ce23 100644
 CONFIG_MTD_RAW_NAND=y
 CONFIG_MTD_SPI_NAND=y
 CONFIG_MTD_SPI_NOR=y
-@@ -422,7 +278,6 @@ CONFIG_NET_DSA=y
+@@ -423,7 +279,6 @@ CONFIG_NET_DSA=y
 CONFIG_NET_DSA_MT7530=y
 CONFIG_NET_DSA_TAG_MTK=y
 CONFIG_NET_FLOW_LIMIT=y
@@ -102267,7 +102268,7 @@ index b873bdc40c..2d7f82ce23 100644
 CONFIG_NET_MEDIATEK_SOC=y
 CONFIG_NET_SWITCHDEV=y
 CONFIG_NET_VENDOR_MEDIATEK=y
-@@ -447,7 +302,6 @@ CONFIG_PARTITION_PERCPU=y
+@@ -448,7 +303,6 @@ CONFIG_PARTITION_PERCPU=y
 CONFIG_PCI=y
 CONFIG_PCIEAER=y
 CONFIG_PCIEASPM=y
@@ -102275,7 +102276,7 @@ index b873bdc40c..2d7f82ce23 100644
 # CONFIG_PCIEASPM_DEFAULT is not set
 CONFIG_PCIEASPM_PERFORMANCE=y
 # CONFIG_PCIEASPM_POWERSAVE is not set
-@@ -460,6 +314,7 @@ CONFIG_PCI_DOMAINS=y
+@@ -461,6 +315,7 @@ CONFIG_PCI_DOMAINS=y
 CONFIG_PCI_DOMAINS_GENERIC=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_MSI_IRQ_DOMAIN=y
@@ -102283,7 +102284,7 @@ index b873bdc40c..2d7f82ce23 100644
 CONFIG_PGTABLE_LEVELS=3
 CONFIG_PHYLIB=y
 CONFIG_PHYLINK=y
-@@ -477,7 +332,7 @@ CONFIG_PINCTRL_MT7622=y
+@@ -478,7 +333,7 @@ CONFIG_PINCTRL_MT7622=y
 CONFIG_PINCTRL_MT8516=y
 CONFIG_PINCTRL_MTK=y
 CONFIG_PINCTRL_MTK_MOORE=y
@@ -102292,7 +102293,7 @@ index b873bdc40c..2d7f82ce23 100644
 CONFIG_PM=y
 CONFIG_PM_CLK=y
 CONFIG_PM_GENERIC_DOMAINS=y
-@@ -487,6 +342,20 @@ CONFIG_POWER_RESET=y
+@@ -488,6 +343,20 @@ CONFIG_POWER_RESET=y
 CONFIG_POWER_RESET_SYSCON=y
 CONFIG_POWER_SUPPLY=y
 CONFIG_PRINTK_TIME=y
@@ -102313,7 +102314,7 @@ index b873bdc40c..2d7f82ce23 100644
 CONFIG_PWM=y
 CONFIG_PWM_MEDIATEK=y
 # CONFIG_PWM_MTK_DISP is not set
-@@ -499,7 +368,9 @@ CONFIG_RATIONAL=y
+@@ -500,7 +369,9 @@ CONFIG_RATIONAL=y
 CONFIG_RCU_NEED_SEGCBLIST=y
 CONFIG_RCU_STALL_COMMON=y
 CONFIG_REALTEK_PHY=y
@@ -102324,7 +102325,7 @@ index b873bdc40c..2d7f82ce23 100644
 CONFIG_REGMAP=y
 CONFIG_REGMAP_MMIO=y
 CONFIG_REGULATOR=y
-@@ -552,7 +423,6 @@ CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
+@@ -555,7 +426,6 @@ CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
 CONFIG_THERMAL_EMULATION=y
 CONFIG_THERMAL_GOV_BANG_BANG=y
 CONFIG_THERMAL_GOV_FAIR_SHARE=y
@@ -102332,7 +102333,7 @@ index b873bdc40c..2d7f82ce23 100644
 CONFIG_THERMAL_GOV_STEP_WISE=y
 CONFIG_THERMAL_GOV_USER_SPACE=y
 CONFIG_THERMAL_OF=y
-@@ -584,6 +454,9 @@ CONFIG_WATCHDOG_PRETIMEOUT_GOV_PANIC=y
+@@ -587,6 +457,9 @@ CONFIG_WATCHDOG_PRETIMEOUT_GOV_PANIC=y
 CONFIG_WATCHDOG_PRETIMEOUT_GOV_SEL=m
 CONFIG_WATCHDOG_SYSFS=y
 CONFIG_XPS=y
--- a/backports/0005-sysupgrade-nand-allow-limiting-rootfs_data-by-settin.patch
+++ b/backports/0005-sysupgrade-nand-allow-limiting-rootfs_data-by-settin.patch
@@ -1,7 +1,7 @@
-From 0a0953b5c81a2b5b366a3f0f543db71ffc81f713 Mon Sep 17 00:00:00 2001
+From 7ed003d57f1c5273fecddabcdc7bd6845c3854a0 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Sat, 20 Feb 2021 08:36:43 +0100
-Subject: [PATCH 5/9] sysupgrade-nand: allow limiting rootfs_data by setting
+Subject: [PATCH 05/27] sysupgrade-nand: allow limiting rootfs_data by setting
 env variable
 Check if firmware environment variable 'rootfs_data_max' exists and is
--- a/backports/0006-uboot-mediatek-add-support-for-linksys-e8450.patch
+++ b/backports/0006-uboot-mediatek-add-support-for-linksys-e8450.patch
@@ -1,7 +1,7 @@
-From eed2e31cb32b565a3ebcc3bc2e9d7dc7a9550b4b Mon Sep 17 00:00:00 2001
+From 3c6515c9db444da27192c1182fa1e9ab8ba6e2f6 Mon Sep 17 00:00:00 2001
 From: Daniel Golle <daniel@makrotopia.org>
 Date: Sat, 30 Jan 2021 13:58:16 +0000
-Subject: [PATCH 01/36] uboot-mediatek: add support for linksys e8450
+Subject: [PATCH 06/27] uboot-mediatek: add support for linksys e8450
 Build U-Boot for the Linksys E8450 in order to have support for UBI.
 The loader has a default environment with scripts handling the reset
--- a/backports/0007-uboot-envtools-add-defaults-for-linksys-e8450-ubi.patch
+++ b/backports/0007-uboot-envtools-add-defaults-for-linksys-e8450-ubi.patch
@@ -1,7 +1,7 @@
-From 256daf33ec9c8cc8b094d7612ba7384db18d0a6b Mon Sep 17 00:00:00 2001
+From 1a9921bab861dd2c89337c3e4833c716a0474653 Mon Sep 17 00:00:00 2001
 From: Daniel Golle <daniel@makrotopia.org>
 Date: Fri, 12 Feb 2021 03:09:39 +0000
-Subject: [PATCH 04/64] uboot-envtools: add defaults for linksys-e8450-ubi
+Subject: [PATCH 07/27] uboot-envtools: add defaults for linksys-e8450-ubi
 Add U-Boot environment configuration for the Linksys E8450 (UBI) to
 allow access to the bootloader environment from OpenWrt via
--- a/backports/0008-realtek-update-to-latest-owrt-HEAD.patch
+++ b/backports/0008-realtek-update-to-latest-owrt-HEAD.patch
--- a/backports/0009-include-set-kernel-version.mk.patch
+++ b/backports/0009-include-set-kernel-version.mk.patch
@@ -1,7 +1,7 @@
-From 3b896a540de03ca8dfd5596881f9ec6dc15d72c9 Mon Sep 17 00:00:00 2001
+From 4ed9b7d04405d5109681643f3ceebbd25f3f28e2 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Wed, 7 Apr 2021 10:46:26 +0200
-Subject: [PATCH 01/32] include: set kernel-version.mk
+Subject: [PATCH 09/27] include: set kernel-version.mk
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
@@ -9,7 +9,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
 1 file changed, 6 insertions(+)
 diff --git a/include/kernel-version.mk b/include/kernel-version.mk
-index 52e5c11d75..547f57fa11 100644
+index fe81dbf603..3c109c13c8 100644
 --- a/include/kernel-version.mk
 +++ b/include/kernel-version.mk
@@ -6,9 +6,15 @@ ifdef CONFIG_TESTING_KERNEL
@@ -18,12 +18,12 @@ index 52e5c11d75..547f57fa11 100644
 +LINUX_VERSION-4.4 = .60
 +LINUX_VERSION-4.14 = .193
- LINUX_VERSION-5.4 = .111
+ LINUX_VERSION-5.4 = .142
 +LINUX_VERSION-5.10 = .27
 +LINUX_KERNEL_HASH-4.4.60 = 2cd8df6f1ac6a5329c5a286ec9b5956215977221a1b731597ed169fff74a9659
 +LINUX_KERNEL_HASH-4.14.193 = 0b0fb41d4430e1a42738b341cbfd2f41951aa5cd02acabbd53f076119c8b9f03
- LINUX_KERNEL_HASH-5.4.111 = 21626132658dc34cb41b7aa7b80ecf83751890a71ac1a63d77aea9d488271a03
+ LINUX_KERNEL_HASH-5.4.142 = 99785728968564ba27c7e552d024b560072dcbc885540912eabb5c021e231451
 +LINUX_KERNEL_HASH-5.10.27 = d99dc9662951299c53a0a8d8c8d0a72a16ff861d20e927c0f9b14f63282d69d9
 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
--- a/backports/0010-ar71xx-forward-port-target-to-get-routerboard-suppor.patch
+++ b/backports/0010-ar71xx-forward-port-target-to-get-routerboard-suppor.patch
@@ -1,7 +1,7 @@
-From b6a89df399cae510f531473e04b5fd938b811ed7 Mon Sep 17 00:00:00 2001
+From a5f4e99a365f392feca84f29b7011fb507771f0e Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Tue, 20 Apr 2021 11:13:20 +0200
-Subject: [PATCH 02/32] ar71xx: forward port target to get routerboard support
+Subject: [PATCH 10/27] ar71xx: forward port target to get routerboard support
 This is only a 1 month interim until the new nand driver for ath79 is ready
@@ -1462,7 +1462,7 @@ index 2921cd5bca..b869ccae70 100644
 			default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_lantiq
 			default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_mpc85xx
 diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk
-index 3dd20a0696..d3752c22b4 100644
+index 4191590ba7..592affe494 100644
 --- a/package/kernel/linux/modules/usb.mk
 +++ b/package/kernel/linux/modules/usb.mk
@@ -1590,7 +1590,7 @@ $(eval $(call KernelPackage,usbip-server))
--- a/backports/0011-backport-mkits.sh.patch
+++ b/backports/0011-backport-mkits.sh.patch
@@ -1,7 +1,7 @@
-From 43f832c25bb9dee1a817370ab11531e81348f177 Mon Sep 17 00:00:00 2001
+From ad860cb413d1934332de60658d5eb8fb64d19663 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Sun, 9 May 2021 12:23:00 +0200
-Subject: [PATCH 42/43] backport: mkits.sh
+Subject: [PATCH 11/27] backport: mkits.sh
 969083634481c3ab5fb80509f385ef10ab45b55f
 e991c1b8a2385397fc1e657ed73878938997d951
@@ -17,10 +17,10 @@ Signed-off-by: John Crispin <john@phrozen.org>
 5 files changed, 95 insertions(+), 12 deletions(-)
 diff --git a/include/image-commands.mk b/include/image-commands.mk
-index bde6e030bc..f97d4363d1 100644
+index 2c917d613e..c6e8eb0293 100644
 --- a/include/image-commands.mk
 +++ b/include/image-commands.mk
-@@ -204,7 +204,7 @@ define Build/fit
+@@ -203,7 +203,7 @@ define Build/fit
 		$(if $(word 3,$(1)),-r $(IMAGE_ROOTFS) -f $(subst _,$(comma),$(DEVICE_NAME))) \
 		-a $(KERNEL_LOADADDR) -e $(if $(KERNEL_ENTRY),$(KERNEL_ENTRY),$(KERNEL_LOADADDR)) \
 		$(if $(DEVICE_FDT_NUM),-n $(DEVICE_FDT_NUM)) \
@@ -30,7 +30,7 @@ index bde6e030bc..f97d4363d1 100644
 	PATH=$(LINUX_DIR)/scripts/dtc:$(PATH) mkimage $(if $(word 3,$(1)),-E -B 0x1000 -p 0x1000) -f $@.its $@.new
 	@mv $@.new $@
 diff --git a/include/image.mk b/include/image.mk
-index fc46012e87..7a48b789af 100644
+index b6e8ab3c84..7c2dcf0e8b 100644
 --- a/include/image.mk
 +++ b/include/image.mk
@@ -139,7 +139,7 @@ endef
--- a/backports/0012-libubox-update-to-latest-HEAD.patch
+++ b/backports/0012-libubox-update-to-latest-HEAD.patch
@@ -1,29 +1,24 @@
-From 029282d8ef8e4e813817d1c7d4aeae4208bc2da5 Mon Sep 17 00:00:00 2001
+From 2af08d2e85ee946de5f53bbd0ddf239de9b78f6d Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Tue, 18 May 2021 10:46:43 +0200
-Subject: [PATCH 01/52] libubox: update to latest HEAD
+Subject: [PATCH 12/27] libubox: update to latest HEAD
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
- package/libs/libubox/Makefile | 10 +++++-----
+ package/libs/libubox/Makefile | 8 ++++----
- 1 file changed, 5 insertions(+), 5 deletions(-)
+ 1 file changed, 4 insertions(+), 4 deletions(-)
 diff --git a/package/libs/libubox/Makefile b/package/libs/libubox/Makefile
-index 4d582eacfd..33aa73eef7 100644
+index d2c07783e1..33aa73eef7 100644
 --- a/package/libs/libubox/Makefile
 +++ b/package/libs/libubox/Makefile
-@@ -1,13 +1,13 @@
+@@ -5,9 +5,9 @@ PKG_RELEASE=2
 include $(TOPDIR)/rules.mk
 PKG_NAME:=libubox
 -PKG_RELEASE=1
 +PKG_RELEASE=2
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/libubox.git
-PKG_MIRROR_HASH:=97dc4eba01cf2c5d6a6d0db3747e0cdc0d95cb87e51b3115272e7d3e69a8b255
+-PKG_MIRROR_HASH:=7dd1db1e0074a9c7c722db654cce3111b3bd3cff0bfd791c4497cb0f6c22d3ca
-PKG_SOURCE_DATE:=2020-12-12
+-PKG_SOURCE_DATE:=2021-05-16
-PKG_SOURCE_VERSION:=357877693ca363b12e6e7e14d345639b2440cd07
+-PKG_SOURCE_VERSION:=b14c4688612c05c78ce984d7bde633bce8703b1e
 +PKG_MIRROR_HASH:=1cdb91ac0ee925f133ee9f70eac131a99def312fe7cf0aed44df84eb1762e30b
 +PKG_SOURCE_DATE:=2021-08-19
 +PKG_SOURCE_VERSION:=d716ac4bc4236031d4c3cc1ed362b502e20e3787
--- a/backports/0013-iw-update-to-latest-HEAD.patch
+++ b/backports/0013-iw-update-to-latest-HEAD.patch
@@ -1,167 +0,0 @@
 From 0ddce2498be815e098154867d0b18293fe613f12 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Thu, 27 May 2021 11:57:10 +0200
 Subject: [PATCH 13/13] iw: update to latest HEAD
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
 package/network/utils/iw/Makefile             | 11 +++----
 .../utils/iw/patches/200-reduce_size.patch    | 30 +++++++++----------
 2 files changed, 21 insertions(+), 20 deletions(-)
 diff --git a/package/network/utils/iw/Makefile b/package/network/utils/iw/Makefile
 index 6db9aaf105..8e11046189 100644
 --- a/package/network/utils/iw/Makefile
 +++ b/package/network/utils/iw/Makefile
@@ -8,12 +8,13 @@
 include $(TOPDIR)/rules.mk
 PKG_NAME:=iw
 -PKG_VERSION:=5.9
 -PKG_RELEASE:=1
 +PKG_VERSION:=5.9-8fab0c9e
 +PKG_RELEASE:=$(AUTORELEASE)
 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 -PKG_SOURCE_URL:=@KERNEL/software/network/iw
 -PKG_HASH:=293a07109aeb7e36267cf59e3ce52857e9ffae3a6666eb8ac77894b1839fe1f2
 +PKG_SOURCE_PROTO:=git
 +PKG_SOURCE_URL:=https://git.kernel.org/pub/scm/linux/kernel/git/jberg/iw.git
 +PKG_SOURCE_VERSION:=8fab0c9ee9db217587a58efcc37421c86edcb638
 +PKG_MIRROR_HASH:=797b322bc03952f3127ae0a7da476c14ada1bbe9a9ae234a56dd6f864c568e16
 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 PKG_LICENSE:=GPL-2.0
 diff --git a/package/network/utils/iw/patches/200-reduce_size.patch b/package/network/utils/iw/patches/200-reduce_size.patch
 index af30876012..83e11405cb 100644
 --- a/package/network/utils/iw/patches/200-reduce_size.patch
 +++ b/package/network/utils/iw/patches/200-reduce_size.patch
@@ -1,6 +1,6 @@
 --- a/event.c
 +++ b/event.c
 -@@ -944,6 +944,7 @@ static int print_event(struct nl_msg *ms
 +@@ -956,6 +956,7 @@ static int print_event(struct nl_msg *ms
  	}
  	switch (gnlh->cmd) {
@@ -8,7 +8,7 @@
  	case NL80211_CMD_NEW_WIPHY:
  		printf("renamed to %s\n", nla_get_string(tb[NL80211_ATTR_WIPHY_NAME]));
  		break;
 -@@ -979,6 +980,7 @@ static int print_event(struct nl_msg *ms
 +@@ -991,6 +992,7 @@ static int print_event(struct nl_msg *ms
  	case NL80211_CMD_SCHED_SCAN_RESULTS:
  		printf("got scheduled scan results\n");
  		break;
@@ -16,7 +16,7 @@
  	case NL80211_CMD_WIPHY_REG_CHANGE:
  	case NL80211_CMD_REG_CHANGE:
  		if (gnlh->cmd == NL80211_CMD_WIPHY_REG_CHANGE)
 -@@ -1061,6 +1063,7 @@ static int print_event(struct nl_msg *ms
 +@@ -1073,6 +1075,7 @@ static int print_event(struct nl_msg *ms
  		mac_addr_n2a(macbuf, nla_data(tb[NL80211_ATTR_MAC]));
  		printf("del station %s\n", macbuf);
  		break;
@@ -24,7 +24,7 @@
  	case NL80211_CMD_JOIN_IBSS:
  		mac_addr_n2a(macbuf, nla_data(tb[NL80211_ATTR_MAC]));
  		printf("IBSS %s joined\n", macbuf);
 -@@ -1254,9 +1257,9 @@ static int print_event(struct nl_msg *ms
 +@@ -1271,9 +1274,9 @@ static int print_event(struct nl_msg *ms
  	case NL80211_CMD_CH_SWITCH_NOTIFY:
  		parse_ch_switch_notify(tb, gnlh->cmd);
  		break;
@@ -134,7 +134,7 @@
  {
 --- a/scan.c
 +++ b/scan.c
 -@@ -1297,6 +1297,9 @@ static void print_ht_op(const uint8_t ty
 +@@ -1306,6 +1306,9 @@ static void print_ht_op(const uint8_t ty
  	printf("\t\t * secondary channel offset: %s\n",
  		ht_secondary_offset[data[1] & 0x3]);
  	printf("\t\t * STA channel width: %s\n", sta_chan_width[(data[1] & 0x4)>>2]);
@@ -144,7 +144,7 @@
  	printf("\t\t * RIFS: %d\n", (data[1] & 0x8)>>3);
  	printf("\t\t * HT protection: %s\n", protection[data[2] & 0x3]);
  	printf("\t\t * non-GF present: %d\n", (data[2] & 0x4) >> 2);
 -@@ -1707,6 +1710,14 @@ static void print_ie(const struct ie_pri
 +@@ -1716,6 +1719,14 @@ static void print_ie(const struct ie_pri
  static const struct ie_print ieprinters[] = {
  	[0] = { "SSID", print_ssid, 0, 32, BIT(PRINT_SCAN) | BIT(PRINT_LINK), },
@@ -159,7 +159,7 @@
  	[1] = { "Supported rates", print_supprates, 0, 255, BIT(PRINT_SCAN), },
  	[3] = { "DS Parameter set", print_ds, 1, 1, BIT(PRINT_SCAN), },
  	[5] = { "TIM", print_tim, 4, 255, BIT(PRINT_SCAN), },
 -@@ -1716,26 +1727,20 @@ static const struct ie_print ieprinters[
 +@@ -1725,26 +1736,20 @@ static const struct ie_print ieprinters[
  	[32] = { "Power constraint", print_powerconstraint, 1, 1, BIT(PRINT_SCAN), },
  	[35] = { "TPC report", print_tpcreport, 2, 2, BIT(PRINT_SCAN), },
  	[42] = { "ERP", print_erp, 1, 255, BIT(PRINT_SCAN), },
@@ -187,15 +187,15 @@
  };
  static void print_wifi_wpa(const uint8_t type, uint8_t len, const uint8_t *data,
 -@@ -2279,6 +2284,7 @@ void print_ies(unsigned char *ie, int ie
 +@@ -2326,6 +2331,7 @@ void print_ies(unsigned char *ie, int ie
  		    ieprinters[ie[0]].flags & BIT(ptype)) {
  			print_ie(&ieprinters[ie[0]],
  				 ie[0], ie[1], ie + 2, &ie_buffer);
 +#ifdef IW_FULL
  		} else if (ie[0] == 221 /* vendor */) {
  			print_vendor(ie[1], ie + 2, unknown, ptype);
 - 		} else if (unknown) {
 -@@ -2288,6 +2294,7 @@ void print_ies(unsigned char *ie, int ie
 + 		} else if (ie[0] == 255 /* extension */) {
 +@@ -2337,6 +2343,7 @@ void print_ies(unsigned char *ie, int ie
  			for (i=0; i<ie[1]; i++)
  				printf(" %.2x", ie[2+i]);
  			printf("\n");
@@ -203,7 +203,7 @@
  		}
  		ielen -= ie[1] + 2;
  		ie += ie[1] + 2;
 -@@ -2328,6 +2335,7 @@ static void print_capa_non_dmg(__u16 cap
 +@@ -2377,6 +2384,7 @@ static void print_capa_non_dmg(__u16 cap
  		printf(" ESS");
  	if (capa & WLAN_CAPABILITY_IBSS)
  		printf(" IBSS");
@@ -211,7 +211,7 @@
  	if (capa & WLAN_CAPABILITY_CF_POLLABLE)
  		printf(" CfPollable");
  	if (capa & WLAN_CAPABILITY_CF_POLL_REQUEST)
 -@@ -2356,6 +2364,7 @@ static void print_capa_non_dmg(__u16 cap
 +@@ -2405,6 +2413,7 @@ static void print_capa_non_dmg(__u16 cap
  		printf(" DelayedBACK");
  	if (capa & WLAN_CAPABILITY_IMM_BACK)
  		printf(" ImmediateBACK");
@@ -219,7 +219,7 @@
  }
  static int print_bss_handler(struct nl_msg *msg, void *arg)
 -@@ -2440,8 +2449,10 @@ static int print_bss_handler(struct nl_m
 +@@ -2489,8 +2498,10 @@ static int print_bss_handler(struct nl_m
  	if (bss[NL80211_BSS_FREQUENCY]) {
  		int freq = nla_get_u32(bss[NL80211_BSS_FREQUENCY]);
  		printf("\tfreq: %d\n", freq);
@@ -230,7 +230,7 @@
  	}
  	if (bss[NL80211_BSS_BEACON_INTERVAL])
  		printf("\tbeacon interval: %d TUs\n",
 -@@ -2635,6 +2646,7 @@ static int handle_stop_sched_scan(struct
 +@@ -2684,6 +2695,7 @@ static int handle_stop_sched_scan(struct
  	return 0;
  }
@@ -238,7 +238,7 @@
  COMMAND(scan, sched_start,
  	SCHED_SCAN_OPTIONS,
  	NL80211_CMD_START_SCHED_SCAN, 0, CIB_NETDEV, handle_start_sched_scan,
 -@@ -2645,3 +2657,4 @@ COMMAND(scan, sched_start,
 +@@ -2694,3 +2706,4 @@ COMMAND(scan, sched_start,
  COMMAND(scan, sched_stop, "",
  	NL80211_CMD_STOP_SCHED_SCAN, 0, CIB_NETDEV, handle_stop_sched_scan,
  	"Stop an ongoing scheduled scan.");
 -- 
 2.25.1
--- a/backports/0013-umdns-update-to-latest-HEAD.patch
+++ b/backports/0013-umdns-update-to-latest-HEAD.patch
@@ -1,7 +1,7 @@
-From e413c12b77acc0012a79e8981b553e35d4a2b20e Mon Sep 17 00:00:00 2001
+From 41db6b8282d09bd9d7ee453f54e592003904ab0e Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Wed, 30 Jun 2021 14:21:23 +0200
-Subject: [PATCH] umdns: update to latest HEAD
+Subject: [PATCH 13/27] umdns: update to latest HEAD
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
--- a/backports/0014-kernel-add-bdpu-filter-support.patch
+++ b/backports/0014-kernel-add-bdpu-filter-support.patch
@@ -1,7 +1,7 @@
-From 97fb5323a826e6b5ad89b5281c0b9d9e92bfc0b4 Mon Sep 17 00:00:00 2001
+From 9df1500bde8e609dcbbecbefa0eb5a29d9e6f7f5 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Fri, 27 Aug 2021 16:52:34 +0200
-Subject: [PATCH 59/59] kernel: add bdpu filter support
+Subject: [PATCH 14/27] kernel: add bdpu filter support
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
--- a/backports/0015-uhttpd-add-config-option-for-json_script.patch
+++ b/backports/0015-uhttpd-add-config-option-for-json_script.patch
@@ -0,0 +1,33 @@
 From 8ba5feb6aaba50bda126db027490c7d37e428e3b Mon Sep 17 00:00:00 2001
 From: Stijn Tintel <stijn@linux-ipv6.be>
 Date: Fri, 20 Aug 2021 16:11:12 +0300
 Subject: [PATCH 15/27] uhttpd: add config option for json_script
 Add a config option for json_script instead of unconditionally including
 all json files in /etc/uhttpd in every uhttpd instance. This makes it
 possible to configure a single instance with an unconditional redirect,
 which is currently not possible as it would render all other uhttpd
 instances unusable.
 Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
 ---
 package/network/services/uhttpd/files/uhttpd.init | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
 diff --git a/package/network/services/uhttpd/files/uhttpd.init b/package/network/services/uhttpd/files/uhttpd.init
 index 869f79bea2..7020912c6c 100755
 --- a/package/network/services/uhttpd/files/uhttpd.init
 +++ b/package/network/services/uhttpd/files/uhttpd.init
@@ -195,7 +195,8 @@ start_instance()
 		append_bool "$cfg" redirect_https "-q" 0
 	}
 -	for file in /etc/uhttpd/*.json; do
 +	config_get json_script "$cfg" json_script
 +	for file in $json_script; do
 		[ -s "$file" ] && procd_append_param command -H "$file"
 	done
 -- 
 2.25.1
--- a/backports/0016-iwinfo-update-to-latest-git-HEAD.patch
+++ b/backports/0016-iwinfo-update-to-latest-git-HEAD.patch
@@ -0,0 +1,41 @@
 From 63281b982b3692828ff453dcb9e68b8e43d628e5 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Mon, 21 Jun 2021 12:53:28 +0200
 Subject: [PATCH 16/27] iwinfo: update to latest git HEAD
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
 package/network/utils/iwinfo/Makefile | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)
 diff --git a/package/network/utils/iwinfo/Makefile b/package/network/utils/iwinfo/Makefile
 index 815c477988..d235f07da9 100644
 --- a/package/network/utils/iwinfo/Makefile
 +++ b/package/network/utils/iwinfo/Makefile
@@ -11,12 +11,20 @@ PKG_RELEASE:=2.1
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/iwinfo.git
 -PKG_SOURCE_DATE:=2021-04-30
 -PKG_SOURCE_VERSION:=c45f0b584b4b86f8250f90ea19afca271c114fa2
 -PKG_MIRROR_HASH:=24ad04791254a0523cd15a4fec6116d9ff121e006c93e5e41459f91347b33ec2
 +PKG_SOURCE_DATE:=2021-06-09
 +PKG_SOURCE_VERSION:=c0414642fead263a4a6a686ad3cb7e965ec8a23a
 +PKG_MIRROR_HASH:=c5686bbae86753c53db03a686b034bbb80d31107cc359ebd8522ea1c82db35ea
 PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
 PKG_LICENSE:=GPL-2.0
 +PKG_FLAGS := nonshared
 +
 +PKG_CONFIG_DEPENDS := \
 +	CONFIG_PACKAGE_kmod-brcm-wl \
 +	CONFIG_PACKAGE_kmod-brcm-wl-mini \
 +	CONFIG_PACKAGE_kmod-brcm-wl-mimo \
 +	CONFIG_PACKAGE_kmod-cfg80211
 +
 IWINFO_ABI_VERSION:=20210430
 include $(INCLUDE_DIR)/package.mk
 -- 
 2.25.1
--- a/backports/0016-kernel-modules-move-act_gact-into-kmod-sched-core.patch
+++ b/backports/0016-kernel-modules-move-act_gact-into-kmod-sched-core.patch
@@ -1,45 +0,0 @@
 From 6c7e11cccbd28224a9a473a36df1102b4257d356 Mon Sep 17 00:00:00 2001
 From: DENG Qingfang <dqfext@gmail.com>
 Date: Fri, 9 Apr 2021 12:25:08 +0800
 Subject: [PATCH 5/6] kernel/modules: move act_gact into kmod-sched-core
 As the name suggests, act_gact has the generic actions such as dropping
 and accepting packets, so move it into kmod-sched-core.
 Signed-off-by: DENG Qingfang <dqfext@gmail.com>
 ---
 package/kernel/linux/modules/netsupport.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk
 index 9fd49c1392..4343e850e9 100644
 --- a/package/kernel/linux/modules/netsupport.mk
 +++ b/package/kernel/linux/modules/netsupport.mk
@@ -721,7 +721,7 @@ $(eval $(call KernelPackage,mppe))
 SCHED_MODULES = $(patsubst $(LINUX_DIR)/net/sched/%.ko,%,$(wildcard $(LINUX_DIR)/net/sched/*.ko))
 -SCHED_MODULES_CORE = sch_ingress sch_fq_codel sch_hfsc sch_htb sch_tbf cls_basic cls_fw cls_route cls_flow cls_tcindex cls_u32 em_u32 act_mirred act_skbedit cls_matchall
 +SCHED_MODULES_CORE = sch_ingress sch_fq_codel sch_hfsc sch_htb sch_tbf cls_basic cls_fw cls_route cls_flow cls_tcindex cls_u32 em_u32 act_gact act_mirred act_skbedit cls_matchall
 SCHED_MODULES_FILTER = $(SCHED_MODULES_CORE) act_connmark act_ctinfo sch_cake sch_netem sch_mqprio em_ipset cls_bpf cls_flower act_bpf act_vlan
 SCHED_MODULES_EXTRA = $(filter-out $(SCHED_MODULES_FILTER),$(SCHED_MODULES))
 SCHED_FILES = $(patsubst %,$(LINUX_DIR)/net/sched/%.ko,$(filter $(SCHED_MODULES_CORE),$(SCHED_MODULES)))
@@ -745,6 +745,7 @@ define KernelPackage/sched-core
 	CONFIG_NET_CLS_ROUTE4 \
 	CONFIG_NET_CLS_TCINDEX \
 	CONFIG_NET_CLS_U32 \
 +	CONFIG_NET_ACT_GACT \
 	CONFIG_NET_ACT_MIRRED \
 	CONFIG_NET_ACT_SKBEDIT \
 	CONFIG_NET_CLS_MATCHALL \
@@ -899,7 +900,6 @@ define KernelPackage/sched
 	CONFIG_NET_SCH_FQ \
 	CONFIG_NET_SCH_PIE \
 	CONFIG_NET_ACT_POLICE \
 -	CONFIG_NET_ACT_GACT \
 	CONFIG_NET_ACT_IPT \
 	CONFIG_NET_ACT_PEDIT \
 	CONFIG_NET_ACT_SIMP \
 -- 
 2.25.1
--- a/backports/0017-netifd-update-to-latest-HEAD.patch
+++ b/backports/0017-netifd-update-to-latest-HEAD.patch
@@ -1,29 +1,26 @@
-From a622ab0c15a2f58b724362339d6b467c02ee7576 Mon Sep 17 00:00:00 2001
+From 3bc625814c04a24cdf16587c2adb2060a77a5e1a Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Thu, 27 May 2021 13:24:47 +0200
-Subject: [PATCH 01/57] netifd: update to latest HEAD
+Subject: [PATCH 17/27] netifd: update to latest HEAD
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
- package/network/config/netifd/Makefile          | 14 +++++++++-----
+ package/network/config/netifd/Makefile          |  8 +++-----
 .../network/config/netifd/files/etc/udhcpc.user |  1 +
 .../config/netifd/files/lib/netifd/dhcp.script  |  3 +++
 .../netifd/patches/002-fix-dhcp-issue.patch     | 17 +++++++++++++++++
- 4 files changed, 30 insertions(+), 5 deletions(-)
+ 2 files changed, 20 insertions(+), 5 deletions(-)
 create mode 100644 package/network/config/netifd/files/etc/udhcpc.user
 create mode 100644 package/network/config/netifd/patches/002-fix-dhcp-issue.patch
 diff --git a/package/network/config/netifd/Makefile b/package/network/config/netifd/Makefile
-index 7061456b08..13c1d96ed7 100644
+index 4b5f110da2..13c1d96ed7 100644
 --- a/package/network/config/netifd/Makefile
 +++ b/package/network/config/netifd/Makefile
@@ -5,16 +5,14 @@ PKG_RELEASE:=1
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/netifd.git
-PKG_SOURCE_DATE:=2021-01-09
+-PKG_SOURCE_DATE:=2021-07-26
-PKG_SOURCE_VERSION:=c00c8335d6188daa326ecfe5a62da15a9b9987e1
+-PKG_SOURCE_VERSION:=440eb0647708274cc8d7d9e7c2bb0cfdfba90023
-PKG_MIRROR_HASH:=c740e51e0cec13eec336ba1c7a643db3b64a9a2235f8c1b73a566cb89e841190
+-PKG_MIRROR_HASH:=eed957036ab608fdc49bdf801fc5b4405fcd2a3a5e5d3343ec39898e156c10e9
 +PKG_SOURCE_DATE:=2021-09-01
 +PKG_SOURCE_VERSION:=300b1220fab38600f102bb8cfcc59a29ce41b095
 +PKG_MIRROR_HASH:=310fa90059795b1c956f9822db712ecc58bc19725b0f05f98c9e0a6824c8ca36
@@ -37,46 +34,6 @@ index 7061456b08..13c1d96ed7 100644
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
@@ -25,6 +23,11 @@ define Package/netifd
   TITLE:=OpenWrt Network Interface Configuration Daemon
 endef
 +define Package/netifd/conffiles
 +/etc/udhcpc.user
 +/etc/udhcpc.user.d/
 +endef
 +
 TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include/libnl-tiny \
 	-I$(STAGING_DIR)/usr/include \
@@ -40,6 +43,7 @@ define Package/netifd/install
 	$(INSTALL_DIR) $(1)/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/netifd $(1)/sbin/
 	$(CP) ./files/* $(1)/
 +	$(INSTALL_DIR) $(1)/etc/udhcpc.user.d/
 	$(CP) $(PKG_BUILD_DIR)/scripts/* $(1)/lib/netifd/
 endef
 diff --git a/package/network/config/netifd/files/etc/udhcpc.user b/package/network/config/netifd/files/etc/udhcpc.user
 new file mode 100644
 index 0000000000..78e2ba5f18
 --- /dev/null
 +++ b/package/network/config/netifd/files/etc/udhcpc.user
@@ -0,0 +1 @@
 +# This script is sourced by udhcpc's dhcp.script at every DHCP event.
 diff --git a/package/network/config/netifd/files/lib/netifd/dhcp.script b/package/network/config/netifd/files/lib/netifd/dhcp.script
 index 6585b641d6..e46005d84c 100755
 --- a/package/network/config/netifd/files/lib/netifd/dhcp.script
 +++ b/package/network/config/netifd/files/lib/netifd/dhcp.script
@@ -112,5 +112,8 @@ esac
 # user rules
 [ -f /etc/udhcpc.user ] && . /etc/udhcpc.user "$@"
 +for f in /etc/udhcpc.user.d/*; do
 +	[ -f "$f" ] && (. "$f" "$@")
 +done
 exit 0
 diff --git a/package/network/config/netifd/patches/002-fix-dhcp-issue.patch b/package/network/config/netifd/patches/002-fix-dhcp-issue.patch
 new file mode 100644
 index 0000000000..6f1d2e708e
--- a/backports/0018-mac80211-update-to-latest-HEAD.patch
+++ b/backports/0018-mac80211-update-to-latest-HEAD.patch
--- a/backports/0019-hostapd-update-to-latest-HEAD.patch
+++ b/backports/0019-hostapd-update-to-latest-HEAD.patch
@@ -1,16 +1,16 @@
-From b70c9429587452776241c95729481accb9c193ae Mon Sep 17 00:00:00 2001
+From 3b094ed6b1602969f0dd71b48ed220d0caace7ab Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
-Date: Thu, 27 May 2021 13:25:19 +0200
+Date: Sat, 4 Sep 2021 05:48:27 +0200
-Subject: [PATCH 03/57] hostapd: upsate to latest HEAD
+Subject: [PATCH 19/27] hostapd: update to latest HEAD
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
 package/network/services/hostapd/Makefile     |  15 +-
 .../hostapd/files/hostapd-basic.config        |   2 +-
 .../hostapd/files/hostapd-full.config         |   4 +-
- .../network/services/hostapd/files/hostapd.sh | 158 ++++++++--
+ .../network/services/hostapd/files/hostapd.sh | 141 +++++++--
 ...-fix-frequency-setup-with-HE-enabled.patch | 196 -------------
- .../001-wolfssl-init-RNG-with-ECC-key.patch   |  43 +++
+ ...> 001-wolfssl-init-RNG-with-ECC-key.patch} |  11 +-
 ...-init-order-disable-pri-sec-channel-.patch | 126 --------
 ...andle-HT40-and-mode-downgrade-in-AP-.patch | 102 -------
 ...ix-frequency-config-for-non-p2p-vht-.patch |  63 ----
@@ -72,9 +72,9 @@ Signed-off-by: John Crispin <john@phrozen.org>
 .../services/hostapd/src/src/ap/ubus.c        | 214 +++++++++++++-
 .../services/hostapd/src/src/ap/ubus.h        |  16 +
 .../hostapd/src/src/utils/build_features.h    |   2 -
- 67 files changed, 1329 insertions(+), 2331 deletions(-)
+ 67 files changed, 1277 insertions(+), 2334 deletions(-)
 delete mode 100644 package/network/services/hostapd/patches/001-HE-VHT-fix-frequency-setup-with-HE-enabled.patch
- create mode 100644 package/network/services/hostapd/patches/001-wolfssl-init-RNG-with-ECC-key.patch
+ rename package/network/services/hostapd/patches/{802-wolfssl-init-RNG-with-ECC-key.patch => 001-wolfssl-init-RNG-with-ECC-key.patch} (76%)
 delete mode 100644 package/network/services/hostapd/patches/002-mesh-fix-channel-init-order-disable-pri-sec-channel-.patch
 delete mode 100644 package/network/services/hostapd/patches/003-wpa_supplicant-handle-HT40-and-mode-downgrade-in-AP-.patch
 delete mode 100644 package/network/services/hostapd/patches/004-wpa_supplicant-fix-frequency-config-for-non-p2p-vht-.patch
@@ -111,7 +111,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
 delete mode 100644 package/network/services/hostapd/patches/801-P2P-Fix-copying-of-secondary-device-types-for-P2P-gr.patch
 diff --git a/package/network/services/hostapd/Makefile b/package/network/services/hostapd/Makefile
-index bd2a7c96ad..fee6889b40 100644
+index 67ea89c339..fee6889b40 100644
 --- a/package/network/services/hostapd/Makefile
 +++ b/package/network/services/hostapd/Makefile
@@ -1,19 +1,17 @@
@@ -126,7 +126,7 @@ index bd2a7c96ad..fee6889b40 100644
 include $(TOPDIR)/rules.mk
 PKG_NAME:=hostapd
-PKG_RELEASE:=32
+-PKG_RELEASE:=35
 +PKG_RELEASE:=$(AUTORELEASE)
 PKG_SOURCE_URL:=http://w1.fi/hostap.git
@@ -179,7 +179,7 @@ index df272e443a..61b6daf861 100644
 # EAP-SAKE for the integrated EAP server
 #CONFIG_EAP_SAKE=y
 diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh
-index 45a49b8faa..e941fa4f77 100644
+index aa72e09eba..e941fa4f77 100644
 --- a/package/network/services/hostapd/files/hostapd.sh
 +++ b/package/network/services/hostapd/files/hostapd.sh
@@ -49,6 +49,7 @@ hostapd_append_wpa_key_mgmt() {
@@ -190,17 +190,15 @@ index 45a49b8faa..e941fa4f77 100644
 		;;
 		eap-eap192)
 			append wpa_key_mgmt "WPA-EAP-SUITE-B-192"
-@@ -91,14 +92,19 @@ hostapd_add_log_config() {
+@@ -91,6 +92,7 @@ hostapd_add_log_config() {
 hostapd_common_add_device_config() {
 	config_add_array basic_rate
 	config_add_array supported_rates
 +	config_add_string beacon_rate
-	config_add_string country
+ 	config_add_string country country3
 +	config_add_string country country3
 	config_add_boolean country_ie doth
- 	config_add_boolean spectrum_mgmt_required
+@@ -99,6 +101,10 @@ hostapd_common_add_device_config() {
 	config_add_int local_pwr_constraint
 	config_add_string require_mode
 	config_add_boolean legacy_rates
 	config_add_int cell_density
@@ -211,27 +209,17 @@ index 45a49b8faa..e941fa4f77 100644
 	config_add_string acs_chan_bias
 	config_add_array hostapd_options
-@@ -114,8 +120,9 @@ hostapd_prepare_device_config() {
+@@ -115,7 +121,8 @@ hostapd_prepare_device_config() {
 	local base_cfg=
-	json_get_vars country country_ie beacon_int:100 dtim_period:2 doth require_mode legacy_rates \
+ 	json_get_vars country country3 country_ie beacon_int:100 dtim_period:2 doth require_mode legacy_rates \
 -		acs_chan_bias local_pwr_constraint spectrum_mgmt_required airtime_mode cell_density
 +	json_get_vars country country3 country_ie beacon_int:100 dtim_period:2 doth require_mode legacy_rates \
 +		acs_chan_bias local_pwr_constraint spectrum_mgmt_required airtime_mode cell_density \
 +		rts_threshold beacon_rate rssi_reject_assoc_rssi rssi_ignore_probe_request maxassoc
 	hostapd_set_log_options base_cfg
-@@ -128,6 +135,7 @@ hostapd_prepare_device_config() {
+@@ -207,11 +214,16 @@ hostapd_prepare_device_config() {
 	[ -n "$country" ] && {
 		append base_cfg "country_code=$country" "$N"
 +		[ -n "$country3" ] && append base_cfg "country3=$country3" "$N"
 		[ "$country_ie" -gt 0 ] && {
 			append base_cfg "ieee80211d=1" "$N"
@@ -206,11 +214,16 @@ hostapd_prepare_device_config() {
 		hostapd_add_rate brlist "$br"
 	done
@@ -248,16 +236,7 @@ index 45a49b8faa..e941fa4f77 100644
 	json_get_values opts hostapd_options
 	for val in $opts; do
-@@ -251,6 +264,8 @@ hostapd_common_add_bss_config() {
+@@ -269,7 +281,7 @@ hostapd_common_add_bss_config() {
 	config_add_int acct_port
 	config_add_int acct_interval
 +	config_add_int bss_load_update_period chan_util_avg_period
 +
 	config_add_string dae_client
 	config_add_string dae_secret
 	config_add_int dae_port
@@ -266,7 +281,7 @@ hostapd_common_add_bss_config() {
 	config_add_array domain_match domain_match2 domain_suffix_match domain_suffix_match2
 	config_add_string ieee80211w_mgmt_cipher
@@ -266,19 +245,15 @@ index 45a49b8faa..e941fa4f77 100644
 	config_add_string vlan_tagged_interface vlan_bridge
 	config_add_string vlan_file
-@@ -281,9 +296,10 @@ hostapd_common_add_bss_config() {
+@@ -287,6 +299,7 @@ hostapd_common_add_bss_config() {
- 	config_add_string wps_device_type wps_device_name wps_manufacturer wps_pin
+ 	config_add_boolean wnm_sleep_mode wnm_sleep_mode_no_keys bss_transition
 	config_add_string multi_ap_backhaul_ssid multi_ap_backhaul_key
 -	config_add_boolean wnm_sleep_mode bss_transition
 +	config_add_boolean wnm_sleep_mode wnm_sleep_mode_no_keys bss_transition
 	config_add_int time_advertisement
 	config_add_string time_zone
 +	config_add_string vendor_elements
 	config_add_boolean ieee80211k rrm_neighbor_report rrm_beacon_report
-@@ -308,6 +324,7 @@ hostapd_common_add_bss_config() {
+@@ -311,6 +324,7 @@ hostapd_common_add_bss_config() {
 	config_add_array supported_rates
 	config_add_boolean sae_require_mfp
@@ -286,7 +261,7 @@ index 45a49b8faa..e941fa4f77 100644
 	config_add_string 'owe_transition_bssid:macaddr' 'owe_transition_ssid:string'
-@@ -316,7 +333,7 @@ hostapd_common_add_bss_config() {
+@@ -319,7 +333,7 @@ hostapd_common_add_bss_config() {
 	config_add_int iw_ipaddr_type_availability iw_gas_address3
 	config_add_string iw_hessid iw_network_auth_type iw_qos_map_set
 	config_add_array iw_roaming_consortium iw_domain_name iw_anqp_3gpp_cell_net iw_nai_realm
@@ -295,7 +270,7 @@ index 45a49b8faa..e941fa4f77 100644
 	config_add_boolean hs20 disable_dgaf osen
 	config_add_int anqp_domain_id
-@@ -327,12 +344,22 @@ hostapd_common_add_bss_config() {
+@@ -330,12 +344,22 @@ hostapd_common_add_bss_config() {
 	config_add_array hs20_conn_capab
 	config_add_string osu_ssid hs20_wan_metrics hs20_operating_class hs20_t_c_filename hs20_t_c_timestamp
@@ -319,7 +294,7 @@ index 45a49b8faa..e941fa4f77 100644
 }
 hostapd_set_vlan_file() {
-@@ -384,7 +411,7 @@ append_iw_anqp_3gpp_cell_net() {
+@@ -387,7 +411,7 @@ append_iw_anqp_3gpp_cell_net() {
 	if [ -z "$iw_anqp_3gpp_cell_net_conf" ]; then
 		iw_anqp_3gpp_cell_net_conf="$1"
 	else
@@ -328,7 +303,7 @@ index 45a49b8faa..e941fa4f77 100644
 	fi
 }
-@@ -396,10 +423,22 @@ append_iw_nai_realm() {
+@@ -399,10 +423,22 @@ append_iw_nai_realm() {
 	[ -n "$1" ] && append bss_conf "nai_realm=$1" "$N"
 }
@@ -351,7 +326,7 @@ index 45a49b8faa..e941fa4f77 100644
 append_osu_provider_service_desc() {
 	append bss_conf "osu_service_desc=$1" "$N"
 }
-@@ -447,6 +486,7 @@ append_osu_provider() {
+@@ -450,6 +486,7 @@ append_osu_provider() {
 	append bss_conf "osu_method_list=$osu_method_list" "$N"
 	config_list_foreach "$1" osu_service_desc append_osu_provider_service_desc
@@ -359,7 +334,7 @@ index 45a49b8faa..e941fa4f77 100644
 	config_list_foreach "$1" osu_icon append_osu_icon
 	append bss_conf "$N"
-@@ -456,6 +496,14 @@ append_hs20_conn_capab() {
+@@ -459,6 +496,14 @@ append_hs20_conn_capab() {
 	[ -n "$1" ] && append bss_conf "hs20_conn_capab=$1" "$N"
 }
@@ -374,7 +349,7 @@ index 45a49b8faa..e941fa4f77 100644
 append_airtime_sta_weight() {
 	[ -n "$1" ] && append bss_conf "airtime_sta_weight=$1" "$N"
 }
-@@ -479,10 +527,12 @@ hostapd_set_bss_options() {
+@@ -482,10 +527,12 @@ hostapd_set_bss_options() {
 		macfilter ssid utf8_ssid wmm uapsd hidden short_preamble rsn_preauth \
 		iapp_interface eapol_version dynamic_vlan ieee80211w nasid \
 		acct_server acct_secret acct_port acct_interval \
@@ -389,7 +364,7 @@ index 45a49b8faa..e941fa4f77 100644
 	set_default isolate 0
 	set_default maxassoc 0
-@@ -503,6 +553,7 @@ hostapd_set_bss_options() {
+@@ -506,6 +553,7 @@ hostapd_set_bss_options() {
 	set_default multi_ap 0
 	set_default airtime_bss_weight 0
 	set_default airtime_bss_limit 0
@@ -397,7 +372,7 @@ index 45a49b8faa..e941fa4f77 100644
 	append bss_conf "ctrl_interface=/var/run/hostapd"
 	if [ "$isolate" -gt 0 ]; then
-@@ -529,6 +580,7 @@ hostapd_set_bss_options() {
+@@ -532,6 +580,7 @@ hostapd_set_bss_options() {
 	append bss_conf "uapsd_advertisement_enabled=$uapsd" "$N"
 	append bss_conf "utf8_ssid=$utf8_ssid" "$N"
 	append bss_conf "multi_ap=$multi_ap" "$N"
@@ -405,7 +380,7 @@ index 45a49b8faa..e941fa4f77 100644
 	[ "$tdls_prohibit" -gt 0 ] && append bss_conf "tdls_prohibit=$tdls_prohibit" "$N"
-@@ -547,6 +599,7 @@ hostapd_set_bss_options() {
+@@ -550,6 +599,7 @@ hostapd_set_bss_options() {
 			append bss_conf "acct_server_shared_secret=$acct_secret" "$N"
 		[ -n "$acct_interval" ] && \
 			append bss_conf "radius_acct_interim_interval=$acct_interval" "$N"
@@ -413,7 +388,7 @@ index 45a49b8faa..e941fa4f77 100644
 	}
 	case "$auth_type" in
-@@ -560,6 +613,7 @@ hostapd_set_bss_options() {
+@@ -563,6 +613,7 @@ hostapd_set_bss_options() {
 		;;
 	esac
 	[ -n "$sae_require_mfp" ] && append bss_conf "sae_require_mfp=$sae_require_mfp" "$N"
@@ -421,7 +396,7 @@ index 45a49b8faa..e941fa4f77 100644
 	local vlan_possible=""
-@@ -601,7 +655,7 @@ hostapd_set_bss_options() {
+@@ -604,7 +655,7 @@ hostapd_set_bss_options() {
 				auth_server auth_secret auth_port \
 				dae_client dae_secret dae_port \
 				ownip radius_client_addr \
@@ -430,7 +405,7 @@ index 45a49b8faa..e941fa4f77 100644
 			# radius can provide VLAN ID for clients
 			vlan_possible=1
-@@ -613,18 +667,22 @@ hostapd_set_bss_options() {
+@@ -616,18 +667,22 @@ hostapd_set_bss_options() {
 			set_default auth_port 1812
 			set_default dae_port 3799
@@ -457,7 +432,7 @@ index 45a49b8faa..e941fa4f77 100644
 			[ -n "$ownip" ] && append bss_conf "own_ip_addr=$ownip" "$N"
 			[ -n "$radius_client_addr" ] && append bss_conf "radius_client_addr=$radius_client_addr" "$N"
-@@ -697,19 +755,24 @@ hostapd_set_bss_options() {
+@@ -700,6 +755,7 @@ hostapd_set_bss_options() {
 	append bss_conf "ssid=$ssid" "$N"
 	[ -n "$network_bridge" ] && append bss_conf "bridge=$network_bridge" "$N"
@@ -465,26 +440,7 @@ index 45a49b8faa..e941fa4f77 100644
 	[ -n "$iapp_interface" ] && {
 		local ifname
 		network_get_device ifname "$iapp_interface" || ifname="$iapp_interface"
- 		append bss_conf "iapp_interface=$ifname" "$N"
+@@ -740,7 +796,7 @@ hostapd_set_bss_options() {
 	}
 -	json_get_vars time_advertisement time_zone wnm_sleep_mode bss_transition
 +	json_get_vars time_advertisement time_zone wnm_sleep_mode wnm_sleep_mode_no_keys bss_transition
 	set_default bss_transition 0
 	set_default wnm_sleep_mode 0
 +	set_default wnm_sleep_mode_no_keys 0
 	[ -n "$time_advertisement" ] && append bss_conf "time_advertisement=$time_advertisement" "$N"
 	[ -n "$time_zone" ] && append bss_conf "time_zone=$time_zone" "$N"
 -	[ "$wnm_sleep_mode" -eq "1" ] && append bss_conf "wnm_sleep_mode=1" "$N"
 +	if [ "$wnm_sleep_mode" -eq "1" ]; then
 +		append bss_conf "wnm_sleep_mode=1" "$N"
 +		[ "$wnm_sleep_mode_no_keys" -eq "1" ] && append bss_conf "wnm_sleep_mode_no_keys=1" "$N"
 +	fi
 	[ "$bss_transition" -eq "1" ] && append bss_conf "bss_transition=1" "$N"
 	json_get_vars ieee80211k rrm_neighbor_report rrm_beacon_report
@@ -733,7 +796,7 @@ hostapd_set_bss_options() {
 			append bss_conf "ftm_responder=1" "$N"
 			[ "$stationary_ap" -eq "1" ] && append bss_conf "stationary_ap=1" "$N"
 			[ -n "$lci" ] && append bss_conf "lci=$lci" "$N"
@@ -493,7 +449,7 @@ index 45a49b8faa..e941fa4f77 100644
 		}
 	fi
-@@ -757,6 +820,7 @@ hostapd_set_bss_options() {
+@@ -764,6 +820,7 @@ hostapd_set_bss_options() {
 				;;
 			esac
@@ -501,7 +457,7 @@ index 45a49b8faa..e941fa4f77 100644
 			append bss_conf "mobility_domain=$mobility_domain" "$N"
 			append bss_conf "ft_psk_generate_local=$ft_psk_generate_local" "$N"
 			append bss_conf "ft_over_ds=$ft_over_ds" "$N"
-@@ -771,6 +835,13 @@ hostapd_set_bss_options() {
+@@ -778,6 +835,13 @@ hostapd_set_bss_options() {
 				set_default r0_key_lifetime 10000
 				set_default pmk_r1_push 0
@@ -515,7 +471,7 @@ index 45a49b8faa..e941fa4f77 100644
 				[ -n "$r1_key_holder" ] && append bss_conf "r1_key_holder=$r1_key_holder" "$N"
 				append bss_conf "r0_key_lifetime=$r0_key_lifetime" "$N"
 				append bss_conf "pmk_r1_push=$pmk_r1_push" "$N"
-@@ -856,13 +927,17 @@ hostapd_set_bss_options() {
+@@ -863,13 +927,17 @@ hostapd_set_bss_options() {
 	}
 	[ -n "$vlan_possible" -a -n "$dynamic_vlan" ] && {
@@ -535,7 +491,7 @@ index 45a49b8faa..e941fa4f77 100644
 		[ -n "$vlan_tagged_interface" ] && \
 			append bss_conf "vlan_tagged_interface=$vlan_tagged_interface" "$N"
 		[ -n "$vlan_file" ] && {
-@@ -875,6 +950,7 @@ hostapd_set_bss_options() {
+@@ -882,6 +950,7 @@ hostapd_set_bss_options() {
 	json_get_vars iw_hessid iw_venue_group iw_venue_type iw_network_auth_type
 	json_get_vars iw_roaming_consortium iw_domain_name iw_anqp_3gpp_cell_net iw_nai_realm
 	json_get_vars iw_anqp_elem iw_qos_map_set iw_ipaddr_type_availability iw_gas_address3
@@ -543,7 +499,7 @@ index 45a49b8faa..e941fa4f77 100644
 	set_default iw_enabled 0
 	if [ "$iw_enabled" = "1" ]; then
-@@ -903,6 +979,8 @@ hostapd_set_bss_options() {
+@@ -910,6 +979,8 @@ hostapd_set_bss_options() {
 		json_for_each_item append_iw_roaming_consortium iw_roaming_consortium
 		json_for_each_item append_iw_anqp_elem iw_anqp_elem
 		json_for_each_item append_iw_nai_realm iw_nai_realm
@@ -552,7 +508,7 @@ index 45a49b8faa..e941fa4f77 100644
 		iw_domain_name_conf=
 		json_for_each_item append_iw_domain_name iw_domain_name
-@@ -917,9 +995,11 @@ hostapd_set_bss_options() {
+@@ -924,9 +995,11 @@ hostapd_set_bss_options() {
 	local hs20 disable_dgaf osen anqp_domain_id hs20_deauth_req_timeout \
@@ -566,7 +522,7 @@ index 45a49b8faa..e941fa4f77 100644
 	set_default hs20 0
 	set_default disable_dgaf $hs20
-@@ -938,16 +1018,31 @@ hostapd_set_bss_options() {
+@@ -945,16 +1018,31 @@ hostapd_set_bss_options() {
 		[ -n "$hs20_operating_class" ] && append bss_conf "hs20_operating_class=$hs20_operating_class" "$N"
 		[ -n "$hs20_t_c_filename" ] && append bss_conf "hs20_t_c_filename=$hs20_t_c_filename" "$N"
 		[ -n "$hs20_t_c_timestamp" ] && append bss_conf "hs20_t_c_timestamp=$hs20_t_c_timestamp" "$N"
@@ -599,7 +555,7 @@ index 45a49b8faa..e941fa4f77 100644
 	set_default per_sta_vif 0
 	if [ "$per_sta_vif" -gt 0 ]; then
-@@ -1072,16 +1167,16 @@ wpa_supplicant_set_fixed_freq() {
+@@ -1079,16 +1167,16 @@ wpa_supplicant_set_fixed_freq() {
 	append network_data "frequency=$freq" "$N$T"
 	case "$htmode" in
 		NOHT) append network_data "disable_ht=1" "$N$T";;
@@ -620,7 +576,7 @@ index 45a49b8faa..e941fa4f77 100644
 		*) append network_data "disable_vht=1" "$N$T";;
 	esac
 }
-@@ -1099,7 +1194,8 @@ wpa_supplicant_add_network() {
+@@ -1106,7 +1194,8 @@ wpa_supplicant_add_network() {
 		ssid bssid key \
 		basic_rate mcast_rate \
 		ieee80211w ieee80211r \
@@ -630,7 +586,7 @@ index 45a49b8faa..e941fa4f77 100644
 	case "$auth_type" in
 		sae|owe|eap192|eap-eap192)
-@@ -1112,6 +1208,7 @@ wpa_supplicant_add_network() {
+@@ -1119,6 +1208,7 @@ wpa_supplicant_add_network() {
 	set_default ieee80211r 0
 	set_default multi_ap 0
@@ -638,7 +594,7 @@ index 45a49b8faa..e941fa4f77 100644
 	local key_mgmt='NONE'
 	local network_data=
-@@ -1143,7 +1240,10 @@ wpa_supplicant_add_network() {
+@@ -1150,7 +1240,10 @@ wpa_supplicant_add_network() {
 		scan_ssid=""
 	}
@@ -852,55 +808,51 @@ index 37c17c50af..0000000000
 - 
 - 	if (ssid->mesh_basic_rates == NULL) {
 - 		/*
-diff --git a/package/network/services/hostapd/patches/001-wolfssl-init-RNG-with-ECC-key.patch b/package/network/services/hostapd/patches/001-wolfssl-init-RNG-with-ECC-key.patch
+diff --git a/package/network/services/hostapd/patches/802-wolfssl-init-RNG-with-ECC-key.patch b/package/network/services/hostapd/patches/001-wolfssl-init-RNG-with-ECC-key.patch
-new file mode 100644
+similarity index 76%
-index 0000000000..84fc1c9351
+rename from package/network/services/hostapd/patches/802-wolfssl-init-RNG-with-ECC-key.patch
--- /dev/null
+rename to package/network/services/hostapd/patches/001-wolfssl-init-RNG-with-ECC-key.patch
 index 89d111e991..84fc1c9351 100644
 --- a/package/network/services/hostapd/patches/802-wolfssl-init-RNG-with-ECC-key.patch
 +++ b/package/network/services/hostapd/patches/001-wolfssl-init-RNG-with-ECC-key.patch
-@@ -0,0 +1,43 @@
+@@ -14,11 +14,9 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
-+From 21ce83b4ae2b9563175fdb4fc4312096cc399cf8 Mon Sep 17 00:00:00 2001
+  src/crypto/crypto_wolfssl.c | 4 ++++
-+From: David Bauer <mail@david-bauer.net>
+  1 file changed, 4 insertions(+)
-+Date: Wed, 5 May 2021 00:44:34 +0200
+ 
-+Subject: [PATCH] wolfssl: add RNG to EC key
+-diff --git a/src/crypto/crypto_wolfssl.c b/src/crypto/crypto_wolfssl.c
-+
+-index 2e4bf8962..ed2528159 100644
-+Since upstream commit 6467de5a8840 ("Randomize z ordinates in
+ --- a/src/crypto/crypto_wolfssl.c
-+scalar mult when timing resistant") WolfSSL requires a RNG for
+ +++ b/src/crypto/crypto_wolfssl.c
-+the EC key when built hardened which is the default.
+-@@ -1303,6 +1303,7 @@ int ecc_projective_add_point(ecc_point *P, ecc_point *Q, ecc_point *R,
 +
 +Set the RNG for the EC key to fix connections for OWE clients.
 +
 +Signed-off-by: David Bauer <mail@david-bauer.net>
 +---
 + src/crypto/crypto_wolfssl.c | 4 ++++
 + 1 file changed, 4 insertions(+)
 +
 +--- a/src/crypto/crypto_wolfssl.c
 ++++ b/src/crypto/crypto_wolfssl.c
 +@@ -1303,6 +1303,7 @@ int ecc_projective_add_point(ecc_point *
-+ 
+  
-+ struct crypto_ec {
+  struct crypto_ec {
-+ 	ecc_key key;
+  	ecc_key key;
-++	WC_RNG rng;
+@@ -26,7 +24,7 @@ index 2e4bf8962..ed2528159 100644
-+ 	mp_int a;
+  	mp_int a;
-+ 	mp_int prime;
+  	mp_int prime;
-+ 	mp_int order;
+  	mp_int order;
 -@@ -1357,6 +1358,8 @@ struct crypto_ec * crypto_ec_init(int group)
 +@@ -1357,6 +1358,8 @@ struct crypto_ec * crypto_ec_init(int gr
-+ 		return NULL;
+  		return NULL;
-+ 
+  
-+ 	if (wc_ecc_init(&e->key) != 0 ||
+  	if (wc_ecc_init(&e->key) != 0 ||
-++	    wc_InitRng(&e->rng) != 0 ||
+@@ -35,7 +33,7 @@ index 2e4bf8962..ed2528159 100644
-++	    wc_ecc_set_rng(&e->key, &e->rng) != 0 ||
+  	    wc_ecc_set_curve(&e->key, 0, curve_id) != 0 ||
-+ 	    wc_ecc_set_curve(&e->key, 0, curve_id) != 0 ||
+  	    mp_init(&e->a) != MP_OKAY ||
-+ 	    mp_init(&e->a) != MP_OKAY ||
+  	    mp_init(&e->prime) != MP_OKAY ||
-+ 	    mp_init(&e->prime) != MP_OKAY ||
+-@@ -1388,6 +1391,7 @@ void crypto_ec_deinit(struct crypto_ec* e)
 +@@ -1388,6 +1391,7 @@ void crypto_ec_deinit(struct crypto_ec*
-+ 	mp_clear(&e->order);
+  	mp_clear(&e->order);
-+ 	mp_clear(&e->prime);
+  	mp_clear(&e->prime);
-+ 	mp_clear(&e->a);
+  	mp_clear(&e->a);
-++	wc_FreeRng(&e->rng);
+@@ -43,6 +41,3 @@ index 2e4bf8962..ed2528159 100644
-+ 	wc_ecc_free(&e->key);
+  	wc_ecc_free(&e->key);
-+ 	os_free(e);
+  	os_free(e);
-+ }
+  }
 --- 
 -2.31.1
 -
 diff --git a/package/network/services/hostapd/patches/002-mesh-fix-channel-init-order-disable-pri-sec-channel-.patch b/package/network/services/hostapd/patches/002-mesh-fix-channel-init-order-disable-pri-sec-channel-.patch
 deleted file mode 100644
 index c7101b1dbc..0000000000
--- a/backports/0020-procd-add-uxc-support.patch
+++ b/backports/0020-procd-add-uxc-support.patch
@@ -1,7 +1,7 @@
-From 8897bab871fb43701fad786c94af5d1b1ef123ae Mon Sep 17 00:00:00 2001
+From aab305d662fa77ef4495574c096cb1e065c1908a Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Sun, 25 Jul 2021 13:32:37 +0200
-Subject: [PATCH 01/46] procd: add uxc support
+Subject: [PATCH 20/27] procd: add uxc support
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
@@ -11,16 +11,16 @@ Signed-off-by: John Crispin <john@phrozen.org>
 3 files changed, 89 insertions(+), 6 deletions(-)
 diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile
-index fff9faa1bf..98f1ed1775 100644
+index 30d5adf427..98f1ed1775 100644
 --- a/package/system/procd/Makefile
 +++ b/package/system/procd/Makefile
@@ -12,9 +12,9 @@ PKG_RELEASE:=$(AUTORELEASE)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/procd.git
-PKG_SOURCE_DATE:=2021-02-08
+-PKG_SOURCE_DATE:=2021-02-23
-PKG_SOURCE_VERSION:=08938fe1cbc06eeaafa39448057368391d165272
+-PKG_SOURCE_VERSION:=37eed131e9967a35f47bacb3437a9d3c8a57b3f4
-PKG_MIRROR_HASH:=efc3deac56057e929789d44742858b2a16d976f6bfa0a2036e413d10afcaeee4
+-PKG_MIRROR_HASH:=2b0131ff9055ccf987cbeb5f36c2c2585dc780999df6be312fbbbcd61ce676d4
 +PKG_SOURCE_DATE:=2021-08-15
 +PKG_SOURCE_VERSION:=104b49d6ab25a8cf067e6d8d1f2da7defb9876d4
 +PKG_MIRROR_HASH:=d13b566a14e84f6babe8b7d3dfb88e34c3dff0e97d7770d6fe71174685bca628
--- a/backports/0021-build-create-APK-files-parrallel-to-IPK.patch
+++ b/backports/0021-build-create-APK-files-parrallel-to-IPK.patch
@@ -1,7 +1,7 @@
-From 0a31ac2bfc8aa43c2a5e43eac81c4647dbf2d1b7 Mon Sep 17 00:00:00 2001
+From 23c15e2536d0fa5ed81c5bdfe7623d3370dca997 Mon Sep 17 00:00:00 2001
 From: Paul Spooren <mail@aparcar.org>
 Date: Fri, 2 Oct 2020 23:30:30 -1000
-Subject: [PATCH 01/45] build: create APK files parrallel to IPK
+Subject: [PATCH 21/27] build: create APK files parrallel to IPK
 Create APK files based on the folder and control files of IPK packages.
@@ -16,11 +16,11 @@ Signed-off-by: Paul Spooren <mail@aparcar.org>
 create mode 100755 scripts/apk-make-index.sh
 diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk
-index c2017cd220..b0177070f8 100644
+index e972b7de0b..5c31b1774f 100644
 --- a/include/package-ipkg.mk
 +++ b/include/package-ipkg.mk
@@ -102,6 +102,7 @@ ifeq ($(DUMP),)
-     ABIV_$(1):=$(if $(filter-out kmod-%,$(1)),$(ABI_VERSION))
+     ABIV_$(1):=$(call FormatABISuffix,$(1),$(ABI_VERSION))
     PDIR_$(1):=$(call FeedPackageDir,$(1))
     IPKG_$(1):=$$(PDIR_$(1))/$(1)$$(ABIV_$(1))_$(VERSION)_$(PKGARCH).ipk
 +    APK_$(1):=$$(PDIR_$(1))/$(1)$$(ABIV_$(1))_$(VERSION)_$(PKGARCH).apk
--- a/backports/0022-fstools-update-to-git-HEAD.patch
+++ b/backports/0022-fstools-update-to-git-HEAD.patch
@@ -1,7 +1,7 @@
-From 2239c3c87a723bee8efa64ecf22c61a15433517e Mon Sep 17 00:00:00 2001
+From 8e8b3e443a7f1d0644f43888c8683698f26d4d13 Mon Sep 17 00:00:00 2001
 From: Daniel Golle <daniel@makrotopia.org>
 Date: Sun, 25 Jul 2021 01:20:31 +0100
-Subject: [PATCH 102/146] fstools: update to git HEAD
+Subject: [PATCH 22/27] fstools: update to git HEAD
 bad1835 fstools: add partname volume driver
 19d7d93 libfstools: partname: several fixes
--- a/backports/0023-tools-libressl-update-to-3.3.3.patch
+++ b/backports/0023-tools-libressl-update-to-3.3.3.patch
@@ -1,7 +1,7 @@
-From c40bb49f31443d9c03043c4361e4af56e5c3eba4 Mon Sep 17 00:00:00 2001
+From 873052b99d6597209957ec32898fa56324cf34a4 Mon Sep 17 00:00:00 2001
 From: Rosen Penev <rosenp@gmail.com>
 Date: Sat, 19 Jun 2021 14:45:11 -0700
-Subject: [PATCH 103/146] tools/libressl: update to 3.3.3
+Subject: [PATCH 23/27] tools/libressl: update to 3.3.3
 Fix wrong FPIC variable usage. Fixes compilation under sparc64 host.
--- a/backports/0024-uvol-backport-package.patch
+++ b/backports/0024-uvol-backport-package.patch
@@ -1,7 +1,7 @@
-From b915cb9a73c7696f25994c3f63fed4e6ea3aa55b Mon Sep 17 00:00:00 2001
+From 08809a60a8f2c065a38c24fcdbd69b939e5c29d9 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Fri, 13 Aug 2021 08:46:57 +0200
-Subject: [PATCH 05/46] uvol: backport package
+Subject: [PATCH 24/27] uvol: backport package
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
@@ -25,7 +25,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
 diff --git a/package/system/uvol/Makefile b/package/system/uvol/Makefile
 new file mode 100644
-index 0000000000..e988d51682
+index 0000000000..bd70410c5e
 --- /dev/null
 +++ b/package/system/uvol/Makefile
@@ -0,0 +1,77 @@
--- a/backports/0025-apk-backport-package.patch
+++ b/backports/0025-apk-backport-package.patch
@@ -1,7 +1,7 @@
-From 6741963067c4be8999896a5e653dc0d72487e392 Mon Sep 17 00:00:00 2001
+From bf98d3c1de524ca50cbc09f825a4b0648e353624 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Fri, 13 Aug 2021 08:47:11 +0200
-Subject: [PATCH 06/46] apk: backport package
+Subject: [PATCH 25/27] apk: backport package
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
--- a/backports/0026-lua-lzlib-backport-package.patch
+++ b/backports/0026-lua-lzlib-backport-package.patch
@@ -1,7 +1,7 @@
-From 900d18f3ae2cd5bb3d8d6e2584d2280cb5302e01 Mon Sep 17 00:00:00 2001
+From ec862d472fca676cc04ce71b640e880ecefdd477 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Fri, 13 Aug 2021 08:48:02 +0200
-Subject: [PATCH 106/146] lua-lzlib: backport package
+Subject: [PATCH 26/27] lua-lzlib: backport package
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
--- a/backports/0027-lua-make-it-easier-to-detect-host-built-Lua.patch
+++ b/backports/0027-lua-make-it-easier-to-detect-host-built-Lua.patch
@@ -1,7 +1,7 @@
-From 5c8a575ec759105e63a3aad033289d124516ec69 Mon Sep 17 00:00:00 2001
+From 5fc717aa60b36934892d6d77c0637fc53aa7f761 Mon Sep 17 00:00:00 2001
 From: Daniel Golle <daniel@makrotopia.org>
 Date: Sat, 10 Jul 2021 20:21:26 +0100
-Subject: [PATCH 107/146] lua: make it easier to detect host-built Lua
+Subject: [PATCH 27/27] lua: make it easier to detect host-built Lua
 Install pkg-config file also for host-build, clean up Lua symlinks.
@@ -12,7 +12,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
 1 file changed, 6 insertions(+), 2 deletions(-)
 diff --git a/package/utils/lua/Makefile b/package/utils/lua/Makefile
-index a54ef7d25a..be18880cb1 100644
+index d262d1e1fc..e15142d8d2 100644
 --- a/package/utils/lua/Makefile
 +++ b/package/utils/lua/Makefile
@@ -134,8 +134,12 @@ define Host/Install
--- a/backports/0035-uhttp-update-to-latest-HEAD.patch
+++ b/backports/0035-uhttp-update-to-latest-HEAD.patch
@@ -1,157 +0,0 @@
 From patchwork Fri Aug 20 13:11:12 2021
 Content-Type: text/plain; charset="utf-8"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 X-Patchwork-Submitter: Stijn Tintel <stijn@linux-ipv6.be>
 X-Patchwork-Id: 1519040
 X-Patchwork-Delegate: stijn@linux-ipv6.be
 Return-Path: 
 <openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org>
 X-Original-To: incoming@patchwork.ozlabs.org
 Delivered-To: patchwork-incoming@bilbo.ozlabs.org
 Authentication-Results: ozlabs.org;
 spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org
 (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org;
 envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org;
 receiver=<UNKNOWN>)
 Authentication-Results: ozlabs.org;
 	dkim=pass (2048-bit key;
 secure) header.d=lists.infradead.org header.i=@lists.infradead.org
 header.a=rsa-sha256 header.s=bombadil.20210309 header.b=r2Ly8Vhy;
 	dkim=fail reason="signature verification failed" (1024-bit key;
 unprotected) header.d=linux-ipv6.be header.i=@linux-ipv6.be
 header.a=rsa-sha256 header.s=502B7754-045F-11E5-BBC5-64595FD46BE8
 header.b=BipII9T0;
 	dkim-atps=neutral
 Received: from bombadil.infradead.org (bombadil.infradead.org
 [IPv6:2607:7c80:54:e::133])
 	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest
 SHA256)
 	(No client certificate requested)
 	by ozlabs.org (Postfix) with ESMTPS id 4Grhsz3FQvz9s1l
 	for <incoming@patchwork.ozlabs.org>; Fri, 20 Aug 2021 23:13:59 +1000 (AEST)
 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
 	d=lists.infradead.org; s=bombadil.20210309; h=Sender:
 	Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post:
 	List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc
 	:To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:
 	Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:
 	List-Owner; bh=Dxw7atu76L/aBQntt7pW1jTYPCULL0mkcY2U1BYT2sI=; b=r2Ly8VhysFZseN
 	kLaheAFj130coCdyeHSxT/951GnDDBkmyursFZAP2hBLaKv9Z+9HpHIGM3sOiNhM/zDKfabNJ/1D2
 	CV4iyPpVkhRxG9t6HPpPx94E6J5Oknl7l6eyL04DWUB28EzXcoBSMiP0zYsoOWjI8sQO8wITNp6hf
 	neAM1VlZlNb22n5/Wu5oD1RoEiMUS5GeyhU7kEFEWpC45rcpyuQdvHpPLMn5GkcqCOO6i90E7BKAK
 	ipYG2tptIjqjrmR+nC6CPRavA+hSG/o6HzDSYNJvWmgVjCc6RpN/xliN03Rum4+mbDtMEB4Wpidmj
 	FepfgPqKxWRJ0UiXBJew==;
 Received: from localhost ([::1] helo=bombadil.infradead.org)
 	by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux))
 	id 1mH4J2-00BF23-C2; Fri, 20 Aug 2021 13:11:32 +0000
 Received: from mail.tintel.eu ([51.83.127.189])
 by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux))
 id 1mH4Iw-00BF1P-CR
 for openwrt-devel@lists.openwrt.org; Fri, 20 Aug 2021 13:11:30 +0000
 Received: from localhost (localhost [IPv6:::1])
 by mail.tintel.eu (Postfix) with ESMTP id 1BE4C4486AC4;
 Fri, 20 Aug 2021 15:11:14 +0200 (CEST)
 Received: from mail.tintel.eu ([IPv6:::1])
 by localhost (mail.tintel.eu [IPv6:::1]) (amavisd-new, port 10032)
 with ESMTP id npDXmiQngdDU; Fri, 20 Aug 2021 15:11:13 +0200 (CEST)
 Received: from localhost (localhost [IPv6:::1])
 by mail.tintel.eu (Postfix) with ESMTP id 5B1EC4486ACC;
 Fri, 20 Aug 2021 15:11:13 +0200 (CEST)
 DKIM-Filter: OpenDKIM Filter v2.10.3 mail.tintel.eu 5B1EC4486ACC
 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux-ipv6.be;
 s=502B7754-045F-11E5-BBC5-64595FD46BE8; t=1629465073;
 bh=3YKw9bephsRsf4MDuHSX4MioHjRWefi/5PEc54pFn4g=;
 h=From:To:Date:Message-Id:MIME-Version;
 b=BipII9T0eY8ENYqcdZ7rxKFn6rwkKKOhJ2IoeLZ1fx4lgpPuGWsZrexzqU6mYTDRa
 Aihei2/ovPeWgUDbzfjNC9hIqv0fXRaEW0sCAPZGOP6gNHWNCkJxuPqYI+4pjijRRt
 6YYC2qCi8DqzQJv7St1FqeVFoIaF8SfbniBW+1N4=
 X-Virus-Scanned: amavisd-new at mail.tintel.eu
 Received: from mail.tintel.eu ([IPv6:::1])
 by localhost (mail.tintel.eu [IPv6:::1]) (amavisd-new, port 10026)
 with ESMTP id J5m0pY66LdR7; Fri, 20 Aug 2021 15:11:13 +0200 (CEST)
 Received: from taz.sof.bg.adlevio.net (unknown [IPv6:2001:67c:21bc:20::10])
 by mail.tintel.eu (Postfix) with SMTP id 17DF94486AC4;
 Fri, 20 Aug 2021 15:11:13 +0200 (CEST)
 Received: (nullmailer pid 141125 invoked by uid 1000);
 Fri, 20 Aug 2021 13:11:12 -0000
 From: Stijn Tintel <stijn@linux-ipv6.be>
 To: openwrt-devel@lists.openwrt.org
 Cc: nbd@nbd.name
 Subject: [PATCH] uhttpd: add config option for json_script
 Date: Fri, 20 Aug 2021 16:11:12 +0300
 Message-Id: <20210820131112.141077-1-stijn@linux-ipv6.be>
 X-Mailer: git-send-email 2.31.1
 MIME-Version: 1.0
 X-Rspamd-Queue-Id: 17DF94486AC4
 X-Spamd-Result: default: False [0.00 / 15.00];
 IP_WHITELIST(0.00)[2001:67c:21bc:20::10];
 ASN(0.00)[asn:200533, ipnet:2001:67c:21bc::/48, country:BG]
 X-Rspamd-Server: skulls
 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 
 X-CRM114-CacheID: sfid-20210820_061126_592239_17869382 
 X-CRM114-Status: UNSURE (   9.50  )
 X-CRM114-Notice: Please train this message.
 X-Spam-Score: 0.2 (/)
 X-Spam-Report: Spam detection software,
 running on the system "bombadil.infradead.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 Content preview: Add a config option for json_script instead of
 unconditionally
 including all json files in /etc/uhttpd in every uhttpd instance. This makes
 it possible to configure a single instance with an unconditi [...]
 Content analysis details:   (0.2 points, 5.0 required)
 pts rule name              description
 ---- ----------------------
 --------------------------------------------------
 -0.0 SPF_PASS               SPF: sender matches SPF record
 -0.0 SPF_HELO_PASS          SPF: HELO matches SPF record
 0.1 DKIM_SIGNED            Message has a DKIM or DK signature,
 not necessarily
 valid
 0.1 DKIM_INVALID           DKIM or DK signature exists, but is not valid
 X-BeenThere: openwrt-devel@lists.openwrt.org
 X-Mailman-Version: 2.1.34
 Precedence: list
 List-Id: OpenWrt Development List <openwrt-devel.lists.openwrt.org>
 List-Unsubscribe: <https://lists.openwrt.org/mailman/options/openwrt-devel>,
 <mailto:openwrt-devel-request@lists.openwrt.org?subject=unsubscribe>
 List-Archive: <http://lists.openwrt.org/pipermail/openwrt-devel/>
 List-Post: <mailto:openwrt-devel@lists.openwrt.org>
 List-Help: <mailto:openwrt-devel-request@lists.openwrt.org?subject=help>
 List-Subscribe: <https://lists.openwrt.org/mailman/listinfo/openwrt-devel>,
 <mailto:openwrt-devel-request@lists.openwrt.org?subject=subscribe>
 Sender: "openwrt-devel" <openwrt-devel-bounces@lists.openwrt.org>
 Errors-To: 
 openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org
 Add a config option for json_script instead of unconditionally including
 all json files in /etc/uhttpd in every uhttpd instance. This makes it
 possible to configure a single instance with an unconditional redirect,
 which is currently not possible as it would render all other uhttpd
 instances unusable.
 Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
 ---
 package/network/services/uhttpd/Makefile          | 2 +-
 package/network/services/uhttpd/files/uhttpd.init | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
 diff --git a/package/network/services/uhttpd/files/uhttpd.init b/package/network/services/uhttpd/files/uhttpd.init
 index e7709941c2..30fd7b4259 100755
 --- a/package/network/services/uhttpd/files/uhttpd.init
 +++ b/package/network/services/uhttpd/files/uhttpd.init
@@ -196,7 +196,8 @@ start_instance()
 		append_bool "$cfg" redirect_https "-q" 0
 	}
 -	for file in /etc/uhttpd/*.json; do
 +	config_get json_script "$cfg" json_script
 +	for file in $json_script; do
 		[ -s "$file" ] && procd_append_param command -H "$file"
 	done
--- a/backports/0036-iwinfo-update-to-latest-git-HEAD.patch
+++ b/backports/0036-iwinfo-update-to-latest-git-HEAD.patch
@@ -1,39 +0,0 @@
 From c90fec205137d8d8c1197722a39d5c700ae3f6b1 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Mon, 21 Jun 2021 12:53:28 +0200
 Subject: [PATCH 02/36] iwinfo: update to latest git HEAD
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
 package/network/utils/iwinfo/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
 diff --git a/package/network/utils/iwinfo/Makefile b/package/network/utils/iwinfo/Makefile
 index 3454d615a9..b7c8370bba 100644
 --- a/package/network/utils/iwinfo/Makefile
 +++ b/package/network/utils/iwinfo/Makefile
@@ -11,9 +11,9 @@ PKG_RELEASE:=1
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/iwinfo.git
 -PKG_SOURCE_DATE:=2021-01-31
 -PKG_SOURCE_VERSION:=4a32b33e9606f1bc1125f4bc24b0581349e55f2e
 -PKG_MIRROR_HASH:=414e5d150efaadba21103e66f862be66a94dcf83c16a2850f7c05051a9b0739d
 +PKG_SOURCE_DATE:=2021-06-09
 +PKG_SOURCE_VERSION:=c0414642fead263a4a6a686ad3cb7e965ec8a23a
 +PKG_MIRROR_HASH:=c5686bbae86753c53db03a686b034bbb80d31107cc359ebd8522ea1c82db35ea
 PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
 PKG_LICENSE:=GPL-2.0
@@ -25,7 +25,7 @@ PKG_CONFIG_DEPENDS := \
 	CONFIG_PACKAGE_kmod-brcm-wl-mimo \
 	CONFIG_PACKAGE_kmod-cfg80211
 -IWINFO_ABI_VERSION:=20210106
 +IWINFO_ABI_VERSION:=20210430
 include $(INCLUDE_DIR)/package.mk
 -- 
 2.25.1
--- a/backports/0040-mt76-update-to-latest-HEAD.patch
+++ b/backports/0040-mt76-update-to-latest-HEAD.patch
@@ -1,51 +0,0 @@
 From e01de214b2492e1b8001d6057211017b5f0f6f49 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Thu, 27 May 2021 13:25:41 +0200
 Subject: [PATCH 04/44] mt76: update to latest HEAD
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
 package/kernel/mt76/Makefile | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
 diff --git a/package/kernel/mt76/Makefile b/package/kernel/mt76/Makefile
 index e9e95fa9b3..431c57a240 100644
 --- a/package/kernel/mt76/Makefile
 +++ b/package/kernel/mt76/Makefile
@@ -8,11 +8,12 @@ PKG_LICENSE_FILES:=
 PKG_SOURCE_URL:=https://github.com/openwrt/mt76
 PKG_SOURCE_PROTO:=git
 -PKG_SOURCE_DATE:=2021-04-11
 -PKG_SOURCE_VERSION:=bf45b30d891961dd7c4139dddb58b909ea2c2b5a
 -PKG_MIRROR_HASH:=431cecf80dafa986e805f809522721c2bb26289867d6770695d49baf8b471bea
 +PKG_SOURCE_DATE:=2021-07-15
 +PKG_SOURCE_VERSION:=bbebea7d6dc64313132226adc3f7369d36e9359d
 +PKG_MIRROR_HASH:=17cd74e72c1f6c8742b698bf6772afacc6fba71b233af8c4d59530600cf44d5b
 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 +PKG_USE_NINJA:=0
 PKG_BUILD_PARALLEL:=1
 PKG_CONFIG_DEPENDS += \
@@ -155,7 +156,7 @@ define KernelPackage/mt7615-common
   $(KernelPackage/mt76-default)
   TITLE:=MediaTek MT7615 wireless driver common code
   HIDDEN:=1
 -  DEPENDS+=@PCI_SUPPORT +kmod-mt76-core +kmod-mt76-connac
 +  DEPENDS+=@PCI_SUPPORT +kmod-mt76-core +kmod-mt76-connac +kmod-hwmon-core
   FILES:= $(PKG_BUILD_DIR)/mt7615/mt7615-common.ko
 endef
@@ -213,7 +214,7 @@ endef
 define KernelPackage/mt7915e
   $(KernelPackage/mt76-default)
   TITLE:=MediaTek MT7915e wireless driver
 -  DEPENDS+=@PCI_SUPPORT +kmod-mt7615-common +@DRIVER_11AX_SUPPORT
 +  DEPENDS+=@PCI_SUPPORT +kmod-mt7615-common +kmod-hwmon-core +kmod-thermal +@DRIVER_11AX_SUPPORT
   FILES:= $(PKG_BUILD_DIR)/mt7915/mt7915e.ko
   AUTOLOAD:=$(call AutoProbe,mt7915e)
 endef
 -- 
 2.25.1
--- a/backports/0041-ar71xx-hacks.patch
+++ b/backports/0041-ar71xx-hacks.patch
@@ -1,53 +0,0 @@
 From d01d8c9e5cf7de98222860011d1d5b362bfde005 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Mon, 12 Jul 2021 13:09:25 +0200
 Subject: [PATCH 01/39] ar71xx: hacks
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
 package/kernel/linux/modules/crypto.mk                 | 2 +-
 package/kernel/mac80211/ath.mk                         | 1 +
 target/linux/ar71xx/files/arch/mips/ath79/mach-rb91x.c | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)
 diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk
 index 19b0d4696b..1b1c1e1a51 100644
 --- a/package/kernel/linux/modules/crypto.mk
 +++ b/package/kernel/linux/modules/crypto.mk
@@ -882,7 +882,7 @@ define KernelPackage/crypto-sha256
 	CONFIG_CRYPTO_SHA256_SSSE3
   FILES:= \
 	$(LINUX_DIR)/crypto/sha256_generic.ko \
 -	$(LINUX_DIR)/lib/crypto/libsha256.ko
 +	$(LINUX_DIR)/lib/crypto/libsha256.ko@ge4.15
   AUTOLOAD:=$(call AutoLoad,09,sha256_generic)
   $(call AddDepends/crypto)
 endef
 diff --git a/package/kernel/mac80211/ath.mk b/package/kernel/mac80211/ath.mk
 index ba03ae11a6..ad2860a98e 100644
 --- a/package/kernel/mac80211/ath.mk
 +++ b/package/kernel/mac80211/ath.mk
@@ -43,6 +43,7 @@ config-$(call config_package,ath9k) += ATH9K
 config-$(call config_package,ath9k-common) += ATH9K_COMMON
 config-$(call config_package,owl-loader) += ATH9K_PCI_NO_EEPROM
 config-$(CONFIG_TARGET_ath79) += ATH9K_AHB
 +config-$(CONFIG_TARGET_ar71xx) += ATH9K_AHB
 config-$(CONFIG_TARGET_ipq40xx) += ATH10K_AHB
 config-$(CONFIG_PCI) += ATH9K_PCI
 config-$(CONFIG_ATH_USER_REGD) += ATH_USER_REGD ATH_REG_DYNAMIC_USER_REG_HINTS
 diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-rb91x.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-rb91x.c
 index 9620718962..2cdf97efd6 100644
 --- a/target/linux/ar71xx/files/arch/mips/ath79/mach-rb91x.c
 +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-rb91x.c
@@ -271,6 +271,8 @@ static const struct rb_board_info rb711gr100_boards[] __initconst = {
 	RB_BOARD_INFO("911G-5HPnD", 0),
 	RB_BOARD_INFO("912UAG-2HPnD", RB91X_FLAG_USB | RB91X_FLAG_PCIE),
 	RB_BOARD_INFO("912UAG-5HPnD", RB91X_FLAG_USB | RB91X_FLAG_PCIE),
 +	RB_BOARD_INFO("RB912UAG-2HPnD", RB91X_FLAG_USB | RB91X_FLAG_PCIE),
 +	RB_BOARD_INFO("RB912UAG-5HPnD", RB91X_FLAG_USB | RB91X_FLAG_PCIE),
 };
 static u32 rb711gr100_get_flags(const struct rb_info *info)
 -- 
 2.25.1
--- a/config.yml
+++ b/config.yml
@@ -1,6 +1,6 @@
 repo:  https://github.com/openwrt/openwrt.git
 branch: openwrt-21.02
-revision: 6fd65c657351908302b37447675ee352ec927d93
+revision: 378769b5551714ccaa821b481bfeecbf362f351e
 output_dir: ./output
 patch_folders:
--- a/patches/0001-.gitignore-add-the-profiles-folder.patch
+++ b/patches/0001-.gitignore-add-the-profiles-folder.patch
@@ -1,7 +1,7 @@
-From 77f9263187df8db1da9b6e859a46c8f9ec854035 Mon Sep 17 00:00:00 2001
+From 534b0e8d0ff1407c2c0e8e8c650f47ce6060a7a4 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Tue, 22 Sep 2020 18:02:55 +0200
-Subject: [PATCH 01/21] .gitignore: add the /profiles folder
+Subject: [PATCH 01/43] .gitignore: add the /profiles folder
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
@@ -9,7 +9,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
 1 file changed, 1 insertion(+)
 diff --git a/.gitignore b/.gitignore
-index b6bfe1a525..a2a910ef13 100644
+index 9647daa5a4..70a592e12f 100644
 --- a/.gitignore
 +++ b/.gitignore
@@ -16,6 +16,7 @@
--- a/patches/0002-Revert-toolchain-gcc-Remove-support-for-GCC-5.patch
+++ b/patches/0002-Revert-toolchain-gcc-Remove-support-for-GCC-5.patch
@@ -1,7 +1,7 @@
-From 0778b48ab16067d538021c0bedf1e5312347dcc6 Mon Sep 17 00:00:00 2001
+From 2947f1c2ac5e300d209b952979da30e92330a01f Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Mon, 25 Jan 2021 06:40:20 +0100
-Subject: [PATCH 02/21] Revert "toolchain: gcc: Remove support for GCC 5"
+Subject: [PATCH 02/43] Revert "toolchain: gcc: Remove support for GCC 5"
 This reverts commit 080dc619d4780a1f7b14082b77b28686e694f72d.
 ---
--- a/patches/0003-pending-scripts-add-gen_config.py.patch
+++ b/patches/0003-pending-scripts-add-gen_config.py.patch
@@ -1,7 +1,7 @@
-From f9d39a389ef2a3bbf326580a0769519c1f3bad5f Mon Sep 17 00:00:00 2001
+From 4b5a9307be956685ed6bd14a3e2cb8727eae0b08 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Fri, 19 Jun 2020 10:45:22 +0200
-Subject: [PATCH 01/37] pending: scripts: add gen_config.py
+Subject: [PATCH 03/43] pending: scripts: add gen_config.py
 This script is used to setup the tree based on the profiles/.
--- a/patches/0004-scripts-update-feed-script.patch
+++ b/patches/0004-scripts-update-feed-script.patch
@@ -1,7 +1,7 @@
-From 501a2989de4295029f419406c20f72e10a914db4 Mon Sep 17 00:00:00 2001
+From 2abc67a0fbfbf50f4af2baaee07eb10d214973e4 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Fri, 19 Jun 2020 13:25:27 +0200
-Subject: [PATCH 04/21] scripts: update feed script
+Subject: [PATCH 04/43] scripts: update feed script
 gen_config.py requires the latest version of the feeds script.
--- a/patches/0005-scripts-ubinize-image.sh-allow-setting-the-rootfs-na.patch
+++ b/patches/0005-scripts-ubinize-image.sh-allow-setting-the-rootfs-na.patch
@@ -1,7 +1,7 @@
-From f7b13fd5ac28e13e7ef2c95f3fda2c3ec3b78b39 Mon Sep 17 00:00:00 2001
+From 41347924799ff4f16a12d8f740f5c66b10eb8c43 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Sun, 9 Aug 2020 20:58:52 +0200
-Subject: [PATCH 05/21] scripts/ubinize-image.sh: allow setting the rootfs name
+Subject: [PATCH 05/43] scripts/ubinize-image.sh: allow setting the rootfs name
 This patch allows us to use a different rootfs name. Some QCA boards will
 require the in ubi rfs to be called ubi_rootfs.
@@ -13,7 +13,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
 2 files changed, 9 insertions(+), 1 deletion(-)
 diff --git a/include/image-commands.mk b/include/image-commands.mk
-index bddbed6052..bde6e030bc 100644
+index c6e8eb0293..d4bce80e68 100644
 --- a/include/image-commands.mk
 +++ b/include/image-commands.mk
@@ -86,6 +86,7 @@ define Build/append-ubi
--- a/patches/0006-base-files-set-default-password-to-openwifi.patch
+++ b/patches/0006-base-files-set-default-password-to-openwifi.patch
@@ -1,7 +1,7 @@
-From a067af45a93ebc68f89a8adc88a25f11b4cd9620 Mon Sep 17 00:00:00 2001
+From 73116492498c07a2f9c45a7a66a4b03ac103d37d Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Thu, 30 Jul 2020 16:51:04 +0200
-Subject: [PATCH 06/21] base-files: set default password to "openwifi"
+Subject: [PATCH 06/43] base-files: set default password to "openwifi"
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
@@ -11,10 +11,10 @@ Signed-off-by: John Crispin <john@phrozen.org>
 3 files changed, 3 insertions(+), 3 deletions(-)
 diff --git a/package/base-files/files/bin/config_generate b/package/base-files/files/bin/config_generate
-index ee3958e733..66b11c8a2e 100755
+index 596fcf41fa..30e7c119f7 100755
 --- a/package/base-files/files/bin/config_generate
 +++ b/package/base-files/files/bin/config_generate
-@@ -282,7 +282,7 @@ generate_static_system() {
+@@ -303,7 +303,7 @@ generate_static_system() {
 		add system system
 		set system.@system[-1].hostname='OpenWrt'
 		set system.@system[-1].timezone='UTC'
--- a/patches/0007-base-files-update-banner.patch
+++ b/patches/0007-base-files-update-banner.patch
@@ -1,7 +1,7 @@
-From 86494392a8ae5374e000298b6e06c2bcd4f82cb9 Mon Sep 17 00:00:00 2001
+From a819600041c0fade872c023637ba0c6c5890de78 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Fri, 31 Jul 2020 17:15:13 +0200
-Subject: [PATCH 07/21] base-files: update banner
+Subject: [PATCH 07/43] base-files: update banner
 Use OpenWiFi for the banner.
--- a/patches/0008-base-files-add-the-wlan-ap-repo-hash.patch
+++ b/patches/0008-base-files-add-the-wlan-ap-repo-hash.patch
@@ -1,7 +1,7 @@
-From 5ed64f1cde06fa3f0fb27c618c86aeeb9309d845 Mon Sep 17 00:00:00 2001
+From f887c60cee77011e009d87639560079b828a452a Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Sat, 29 Aug 2020 08:25:41 +0200
-Subject: [PATCH 12/38] base-files: add the wlan-ap repo hash
+Subject: [PATCH 08/43] base-files: add the wlan-ap repo hash
 currently the banner will show the revision of the build tree.
 This patch adds the hash of the wlan-ap tree.
@@ -44,10 +44,10 @@ index a4b47c8a57..214f32974b 100644
 	-e 's,%h,$(call sed_escape,$(VERSION_HWREV)),g'
 diff --git a/package/base-files/Makefile b/package/base-files/Makefile
-index 8a1ddf96f5..0ff6fa84c1 100644
+index 9db4812981..99cb5476f7 100644
 --- a/package/base-files/Makefile
 +++ b/package/base-files/Makefile
-@@ -205,6 +205,7 @@ define Package/base-files/install
+@@ -209,6 +209,7 @@ define Package/base-files/install
 	$(if $(CONFIG_TARGET_PREINIT_DISABLE_FAILSAFE), \
 		rm -f $(1)/etc/banner.failsafe,)
@@ -118,7 +118,7 @@ index 0000000000..4e8f05a700
 +2.25.1
 +
 diff --git a/scripts/gen_config.py b/scripts/gen_config.py
-index 124dfd596a..e9418d776c 100755
+index a36f244e56..a348386124 100755
 --- a/scripts/gen_config.py
 +++ b/scripts/gen_config.py
@@ -62,7 +62,7 @@ def load_yaml(fname: str, profile: dict, include = True):
--- a/patches/0009-base-files-make-sysupgrade-work-on-qcom-AX.patch
+++ b/patches/0009-base-files-make-sysupgrade-work-on-qcom-AX.patch
@@ -1,7 +1,7 @@
-From c6beeb8b4854b12b72a3ff2ed141129023f08eaf Mon Sep 17 00:00:00 2001
+From dfc5ca4495315d293ccdb1c52d7d29a133ba596b Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Mon, 22 Jun 2020 14:32:45 +0200
-Subject: [PATCH 09/21] base-files: make sysupgrade work on qcom AX
+Subject: [PATCH 09/43] base-files: make sysupgrade work on qcom AX
 The qsdk v4.4 ubi layer does not detach the rootfs properly during
 sysupgrade. Pull in the ubu force detach patch from owrt-15.05.
--- a/patches/0010-base-files-add-support-for-v4.4-style-netdev-led-tri.patch
+++ b/patches/0010-base-files-add-support-for-v4.4-style-netdev-led-tri.patch
@@ -1,7 +1,7 @@
-From 0d04a28c9646e245021282bc38740ae2ced17a08 Mon Sep 17 00:00:00 2001
+From db79fb81502c935be1295c258fb4738dfb2351bd Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Wed, 23 Sep 2020 17:34:44 +0200
-Subject: [PATCH 10/21] base-files: add support for v4.4 style netdev led
+Subject: [PATCH 10/43] base-files: add support for v4.4 style netdev led
 triggers
 Current owrt scripting cant handle the old v4.4 style sysfs API of led
--- a/patches/0011-busybox-enable-the-watchdog-tool.patch
+++ b/patches/0011-busybox-enable-the-watchdog-tool.patch
@@ -1,7 +1,7 @@
-From c3e8689eba6ceafc23973883131349ef89c714ed Mon Sep 17 00:00:00 2001
+From 5c54120d8b707a1022052edd562cea1a358a9bce Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Tue, 28 Jul 2020 09:21:04 +0200
-Subject: [PATCH 11/21] busybox: enable the watchdog tool
+Subject: [PATCH 11/43] busybox: enable the watchdog tool
 procd can currently only handle the main wdt. Enable the busybox
 applet until procd can handle multiple devices.
@@ -12,7 +12,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/package/utils/busybox/Config-defaults.in b/package/utils/busybox/Config-defaults.in
-index 04148df267..2389bbb8e0 100644
+index 168c73b24c..d35ce0b7b8 100644
 --- a/package/utils/busybox/Config-defaults.in
 +++ b/package/utils/busybox/Config-defaults.in
@@ -2182,7 +2182,7 @@ config BUSYBOX_DEFAULT_VOLNAME
--- a/patches/0012-dnsmasq-add-relay-option82-support.patch
+++ b/patches/0012-dnsmasq-add-relay-option82-support.patch
@@ -1,7 +1,7 @@
-From 8ca8d0669ea2b36a5542d9bcda32cddf9cd7cd0f Mon Sep 17 00:00:00 2001
+From 42e7cc0388b258ae0f391e7b0dbab9b53b067124 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Tue, 8 Jun 2021 09:12:38 +0200
-Subject: [PATCH] dnsmasq: add relay / option82 support
+Subject: [PATCH 12/43] dnsmasq: add relay / option82 support
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
@@ -11,10 +11,10 @@ Signed-off-by: John Crispin <john@phrozen.org>
 create mode 100644 package/network/services/dnsmasq/patches/200-option82.patch
 diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init
-index 680e72f9e7..51f405b73c 100644
+index 205bfb4cf6..dacd476cd4 100644
 --- a/package/network/services/dnsmasq/files/dnsmasq.init
 +++ b/package/network/services/dnsmasq/files/dnsmasq.init
-@@ -761,12 +761,14 @@ dhcp_relay_add() {
+@@ -777,12 +777,14 @@ dhcp_relay_add() {
 	[ -n "$server_addr" ] || return 0
 	config_get interface "$cfg" interface
--- a/patches/0013-base-files-ignore-sysupgrade-that-was-not-ours.patch
+++ b/patches/0013-base-files-ignore-sysupgrade-that-was-not-ours.patch
@@ -1,7 +1,7 @@
-From 4fb2a69f3bbdab006a6b751ce39203cfdade9ae6 Mon Sep 17 00:00:00 2001
+From 9fb93fbd42f8f1f3036580b6666b40ab343509f8 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Thu, 17 Jun 2021 08:47:51 +0200
-Subject: [PATCH] base-files: ignore sysupgrade that was not ours
+Subject: [PATCH 13/43] base-files: ignore sysupgrade that was not ours
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
--- a/patches/0014-ipq806x-simplify-ecw5410-dts.patch
+++ b/patches/0014-ipq806x-simplify-ecw5410-dts.patch
@@ -1,7 +1,7 @@
-From b820ffd87781ef60bd6b5ef64162adf9cbb7d72b Mon Sep 17 00:00:00 2001
+From 8b82aea440583198be21bbbe4e3f6d7bd814aad8 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Thu, 17 Jun 2021 16:13:40 +0200
-Subject: [PATCH 2/4] ipq806x: simplify ecw5410 dts
+Subject: [PATCH 14/43] ipq806x: simplify ecw5410 dts
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
@@ -37,7 +37,7 @@ index 3befc40630..e5715a79aa 100644
 	linksys,ea8500)
 		caldata_extract "art" 0x5000 0x2f20
 diff --git a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8068-ecw5410.dts b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8068-ecw5410.dts
-index 712910c261..e6fc3453b0 100644
+index 712910c261..e87ef16b9a 100644
 --- a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8068-ecw5410.dts
 +++ b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8068-ecw5410.dts
@@ -95,6 +95,16 @@
--- a/patches/0015-ipq807x-buildsystem-patches-required-by-the-target.patch
+++ b/patches/0015-ipq807x-buildsystem-patches-required-by-the-target.patch
@@ -1,7 +1,7 @@
-From c0442b28c993b63a5af510448e01083f3d681475 Mon Sep 17 00:00:00 2001
+From 2a1e093c78738b3c3e47bbf357efe571ff04d8aa Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Mon, 15 Feb 2021 15:20:44 +0100
-Subject: [PATCH 15/21] ipq807x: buildsystem patches required by the target
+Subject: [PATCH 15/43] ipq807x: buildsystem patches required by the target
 The target uses the v4.4 kernel and requires these patches to build
 properly.
--- a/patches/0016-linux-modules-fix-some-v4.4-dependencies.patch
+++ b/patches/0016-linux-modules-fix-some-v4.4-dependencies.patch
@@ -1,7 +1,7 @@
-From 6942520b7623e3fc793a229e04af2b74fd19f556 Mon Sep 17 00:00:00 2001
+From 5cb922f8d91e2bdd48807adf26336e61b03747a6 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Wed, 24 Mar 2021 15:03:30 +0100
-Subject: [PATCH 16/21] linux/modules: fix some v4.4 dependencies
+Subject: [PATCH 16/43] linux/modules: fix some v4.4 dependencies
 NFT has different deps on v4.4.
@@ -27,13 +27,13 @@ Signed-off-by: John Crispin <john@phrozen.org>
 toolchain/gcc/Config.in                    |  5 +++
 toolchain/gcc/Config.version               |  1 +
 toolchain/kernel-headers/Makefile          |  2 +-
- 21 files changed, 145 insertions(+), 40 deletions(-)
+ 20 files changed, 143 insertions(+), 40 deletions(-)
 diff --git a/config/Config-images.in b/config/Config-images.in
-index 2921cd5bca..969b57efee 100644
+index b869ccae70..de11c52676 100644
 --- a/config/Config-images.in
 +++ b/config/Config-images.in
-@@ -17,6 +17,7 @@ menu "Target Images"
+@@ -18,6 +18,7 @@ menu "Target Images"
 			default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_lantiq
 			default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_mpc85xx
 			default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_ramips
@@ -42,7 +42,7 @@ index 2921cd5bca..969b57efee 100644
 			depends on TARGET_ROOTFS_INITRAMFS
 			help
 diff --git a/include/image.mk b/include/image.mk
-index 2530108211..10e7063f41 100644
+index 7c2dcf0e8b..6fc02a3f6b 100644
 --- a/include/image.mk
 +++ b/include/image.mk
@@ -153,6 +153,7 @@ endif
@@ -62,7 +62,7 @@ index 2530108211..10e7063f41 100644
 define Image/pad-to
 	dd if=$(1) of=$(1).new bs=$(2) conv=sync
 diff --git a/include/kernel.mk b/include/kernel.mk
-index d2a5b42138..4e9561c93c 100644
+index e4074a48f4..56fa06b2eb 100644
 --- a/include/kernel.mk
 +++ b/include/kernel.mk
@@ -44,7 +44,7 @@ else
@@ -261,7 +261,7 @@ index 7526224972..691f8fb186 100644
 __config_list = $(firstword $(wildcard $(call __config_name_list,$(1))))
 find_kernel_config=$(if $(__config_list),$(__config_list),$(lastword $(__config_name_list)))
 diff --git a/package/kernel/linux/modules/can.mk b/package/kernel/linux/modules/can.mk
-index 58c257db5b..3bf0359c11 100644
+index 3060fc0966..5542c4fe0a 100644
 --- a/package/kernel/linux/modules/can.mk
 +++ b/package/kernel/linux/modules/can.mk
@@ -248,7 +248,8 @@ define KernelPackage/can-usb-kvaser
@@ -275,10 +275,10 @@ index 58c257db5b..3bf0359c11 100644
   $(call AddDepends/can,+kmod-usb-core)
 endef
 diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk
-index e9e78e7967..e7776c096c 100644
+index b50ed06824..a68459d989 100644
 --- a/package/kernel/linux/modules/crypto.mk
 +++ b/package/kernel/linux/modules/crypto.mk
-@@ -377,7 +377,7 @@ $(eval $(call KernelPackage,crypto-hw-padlock))
+@@ -387,7 +387,7 @@ $(eval $(call KernelPackage,crypto-hw-padlock))
 define KernelPackage/crypto-hw-safexcel
   TITLE:= MVEBU SafeXcel Crypto Engine module
@@ -287,7 +287,7 @@ index e9e78e7967..e7776c096c 100644
 	+kmod-crypto-authenc +kmod-crypto-md5 +kmod-crypto-hmac +kmod-crypto-sha256 +kmod-crypto-sha512
   KCONFIG:= \
 	CONFIG_CRYPTO_HW=y \
-@@ -549,8 +549,10 @@ ifndef CONFIG_TARGET_x86_64
+@@ -710,8 +710,10 @@ ifndef CONFIG_TARGET_x86_64
 	$(LINUX_DIR)/arch/x86/crypto/twofish-i586.ko \
 	$(LINUX_DIR)/arch/x86/crypto/serpent-sse2-i586.ko \
 	$(LINUX_DIR)/arch/x86/crypto/glue_helper.ko \
@@ -299,7 +299,7 @@ index e9e78e7967..e7776c096c 100644
     AUTOLOAD+= $(call AutoLoad,10,cryptd glue_helper \
 	serpent-sse2-i586 twofish-i586 blowfish_generic)
   endef
-@@ -569,7 +571,8 @@ define KernelPackage/crypto-misc/x86/64
+@@ -730,7 +732,8 @@ define KernelPackage/crypto-misc/x86/64
 	$(LINUX_DIR)/arch/x86/crypto/twofish-avx-x86_64.ko \
 	$(LINUX_DIR)/arch/x86/crypto/serpent-avx-x86_64.ko \
 	$(LINUX_DIR)/arch/x86/crypto/camellia-aesni-avx2.ko \
@@ -413,7 +413,7 @@ index e2bb1d0681..1be05e182a 100644
 endef
 diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk
-index 2c2fe82fa0..36e1732c11 100644
+index 1eec9f9b63..4343e850e9 100644
 --- a/package/kernel/linux/modules/netsupport.mk
 +++ b/package/kernel/linux/modules/netsupport.mk
@@ -375,7 +375,7 @@ $(eval $(call KernelPackage,ip6-vti))
@@ -425,7 +425,7 @@ index 2c2fe82fa0..36e1732c11 100644
   KCONFIG:=CONFIG_XFRM_INTERFACE
   FILES:=$(LINUX_DIR)/net/xfrm/xfrm_interface.ko
   AUTOLOAD:=$(call AutoProbe,xfrm_interface)
-@@ -764,7 +764,7 @@ $(eval $(call KernelPackage,sched-core))
+@@ -765,7 +765,7 @@ $(eval $(call KernelPackage,sched-core))
 define KernelPackage/sched-cake
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=Cake fq_codel/blue derived shaper
@@ -434,7 +434,7 @@ index 2c2fe82fa0..36e1732c11 100644
   KCONFIG:=CONFIG_NET_SCH_CAKE
   FILES:=$(LINUX_DIR)/net/sched/sch_cake.ko
   AUTOLOAD:=$(call AutoProbe,sch_cake)
-@@ -1147,7 +1147,7 @@ $(eval $(call KernelPackage,rxrpc))
+@@ -1154,7 +1154,7 @@ $(eval $(call KernelPackage,rxrpc))
 define KernelPackage/mpls
   SUBMENU:=$(NETWORK_SUPPORT_MENU)
   TITLE:=MPLS support
@@ -508,7 +508,7 @@ index 83d998c83a..784adcb744 100644
   FILES:= $(LINUX_DIR)/drivers/char/tpm/tpm.ko
   AUTOLOAD:=$(call AutoLoad,10,tpm,1)
 diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk
-index 3dd20a0696..e3acb4bf79 100644
+index 592affe494..41d12cb08a 100644
 --- a/package/kernel/linux/modules/usb.mk
 +++ b/package/kernel/linux/modules/usb.mk
@@ -458,9 +458,28 @@ endef
--- a/patches/0017-ipq807x-add-the-Qualcomm-AX-target-support.patch
+++ b/patches/0017-ipq807x-add-the-Qualcomm-AX-target-support.patch
@@ -1,7 +1,7 @@
-From 67774c73ab28997107e29487a95d9c96e11398f7 Mon Sep 17 00:00:00 2001
+From 6ec4c8f7d24c34c5855278fe13bde4e5e43ba293 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Sat, 18 Jul 2020 08:53:44 +0200
-Subject: [PATCH 01/22] ipq807x: add the Qualcomm AX target support
+Subject: [PATCH 17/43] ipq807x: add the Qualcomm AX target support
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
@@ -119,7 +119,7 @@ index f71114b5da..4a85d83118 100644
 	string "Custom Kernel Build User Name"
 	default "builder" if BUILDBOT
 diff --git a/include/image.mk b/include/image.mk
-index 5ee6d309e4..7a48b789af 100644
+index 6fc02a3f6b..92b23321b1 100644
 --- a/include/image.mk
 +++ b/include/image.mk
@@ -179,6 +179,10 @@ define Image/pad-root-squashfs
@@ -186,10 +186,10 @@ index 0000000000..6c429f1852
 +
 +exit 0
 diff --git a/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-index c4d9dd78e3..6670d310db 100644
+index b12c9af9a7..b7ee73b12e 100644
 --- a/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
 +++ b/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-@@ -254,6 +254,11 @@ case "$FIRMWARE" in
+@@ -265,6 +265,11 @@ case "$FIRMWARE" in
 		caldata_extract "ART" 0x5000 0x2f20
 		ath10k_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) -1)
 		;;
--- a/patches/0018-ramips-add-tplink-ex228-support.patch
+++ b/patches/0018-ramips-add-tplink-ex228-support.patch
@@ -1,7 +1,7 @@
-From 842b431559c3992e182190b7f96c4407978723c7 Mon Sep 17 00:00:00 2001
+From 2970ecaae31c8e42cf1ef5cff2a78cf57701070e Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Thu, 27 May 2021 16:48:27 +0200
-Subject: [PATCH] ramips: add tplink ex228 support
+Subject: [PATCH 18/43] ramips: add tplink ex228 support
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
@@ -148,10 +148,10 @@ index 0000000000..9e5cc9ef01
 +	};
 +};
 diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk
-index a8f558326d..1a84abc842 100644
+index a3bc14d59d..6e0b9b5f76 100644
 --- a/target/linux/ramips/image/mt7621.mk
 +++ b/target/linux/ramips/image/mt7621.mk
-@@ -1138,6 +1138,16 @@ define Device/tplink_eap235-wall-v1
+@@ -1271,6 +1271,16 @@ define Device/tplink_eap235-wall-v1
 endef
 TARGET_DEVICES += tplink_eap235-wall-v1
@@ -169,11 +169,11 @@ index a8f558326d..1a84abc842 100644
   $(Device/dsa-migration)
   $(Device/tplink-safeloader)
 diff --git a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
-index 89e679be7c..b6b8b6482d 100755
+index 4b44669b84..1c4e29dd97 100755
 --- a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
 +++ b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
-@@ -36,6 +36,7 @@ ramips_setup_interfaces()
+@@ -25,6 +25,7 @@ ramips_setup_interfaces()
- 		;;
+ 	ampedwireless,ally-r1900k|\
 	gehua,ghl-r-001|\
 	hiwifi,hc5962|\
 +	tplink,ex228|\
@@ -181,13 +181,13 @@ index 89e679be7c..b6b8b6482d 100755
 	xiaomi,mi-router-ac2100|\
 	xiaomi,redmi-router-ac2100)
 diff --git a/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh b/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh
-index c9152c5cf4..853a464ea5 100755
+index c2ad4d3ed6..acaa62d171 100755
 --- a/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh
 +++ b/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh
-@@ -61,6 +61,7 @@ platform_do_upgrade() {
+@@ -73,6 +73,7 @@ platform_do_upgrade() {
 	netgear,wac104|\
 	netgear,wac124|\
 	netis,wf2881|\
 	sercomm,na502|\
 +	tplink,ex228|\
 	xiaomi,mi-router-3g|\
 	xiaomi,mi-router-3-pro|\
--- a/patches/0019-lldp-add-TIP-tweaks.patch
+++ b/patches/0019-lldp-add-TIP-tweaks.patch
@@ -1,7 +1,7 @@
-From 7a4571cc0c12d54d0aca93dfedbe8dc33cff39fa Mon Sep 17 00:00:00 2001
+From 58242d355b483e105affd0c69c681e46e88ad84c Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Fri, 4 Dec 2020 16:29:35 +0100
-Subject: [PATCH 01/11] lldp: add TIP tweaks
+Subject: [PATCH 19/43] lldp: add TIP tweaks
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
--- a/patches/0020-ramips-make-wifi-work.patch
+++ b/patches/0020-ramips-make-wifi-work.patch
@@ -1,7 +1,7 @@
-From 949cec1e6873109d29ee435d9f2370fbbb7b9700 Mon Sep 17 00:00:00 2001
+From e00ffc2ad678216a318106da687701aafa5a1ac7 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Fri, 4 Dec 2020 16:29:16 +0100
-Subject: [PATCH 20/21] ramips: make wifi work
+Subject: [PATCH 20/43] ramips: make wifi work
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
@@ -9,7 +9,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
 1 file changed, 1 insertion(+)
 diff --git a/target/linux/ramips/mt76x8/config-5.4 b/target/linux/ramips/mt76x8/config-5.4
-index ec21b3722b..725aa9b070 100644
+index dfd01598ad..e82b775758 100644
 --- a/target/linux/ramips/mt76x8/config-5.4
 +++ b/target/linux/ramips/mt76x8/config-5.4
@@ -46,6 +46,7 @@ CONFIG_CPU_R4K_CACHE_TLB=y
--- a/patches/0021-ugps-update-to-latest-HEAD.patch
+++ b/patches/0021-ugps-update-to-latest-HEAD.patch
@@ -1,7 +1,7 @@
-From efdbdcd3503315022a3270886826656be116345b Mon Sep 17 00:00:00 2001
+From 6e5fd4e18759885bd25aa182d5cc7ce1c7f8eeea Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Sat, 19 Jun 2021 16:00:43 +0200
-Subject: [PATCH 38/38] ugps: update to latest HEAD
+Subject: [PATCH 21/43] ugps: update to latest HEAD
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
@@ -9,16 +9,16 @@ Signed-off-by: John Crispin <john@phrozen.org>
 1 file changed, 3 insertions(+), 3 deletions(-)
 diff --git a/package/utils/ugps/Makefile b/package/utils/ugps/Makefile
-index 4ce64d9631..e9a7f4fa8f 100644
+index c70a7b7ea6..389138d1dd 100644
 --- a/package/utils/ugps/Makefile
 +++ b/package/utils/ugps/Makefile
-@@ -12,9 +12,9 @@ PKG_RELEASE:=1
+@@ -12,9 +12,9 @@ PKG_RELEASE:=$(AUTORELEASE)
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/ugps.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_DATE:=2020-08-29
+-PKG_SOURCE_DATE:=2021-06-08
-PKG_SOURCE_VERSION:=511a5b3c84fa715ef0305cf26c98619c12a4867a
+-PKG_SOURCE_VERSION:=5e88403fc0d39ae8a270d2c6c6e9c8a4d5232cf3
-PKG_MIRROR_HASH:=551d57b4c18da4c4695fa2f7a959c25a03be35d14cf872785e7db740f12366e2
+-PKG_MIRROR_HASH:=a3dfc2cc6def3b634d8b7cda9139926be3d876cf2faa5251c4821987954442a5
 +PKG_SOURCE_DATE:=2021-07-19
 +PKG_SOURCE_VERSION:=350b960b6f8b08409dcef719ef1e1e0c8911040f
 +PKG_MIRROR_HASH:=94d489072f8fccc26f624c3d3c65e7cb40e4b6267df5fb39d4e0e78469006bde
--- a/patches/0022-Revert-ipq40xx-revert-usage-of-VLAN-S-TAG.patch
+++ b/patches/0022-Revert-ipq40xx-revert-usage-of-VLAN-S-TAG.patch
@@ -1,7 +1,7 @@
-From 91d0510ff553a1dd43312eee44ef6290a9eb751c Mon Sep 17 00:00:00 2001
+From 687576be91062e5ab25e8ff4e2d990799a34210f Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Thu, 8 Apr 2021 10:46:29 +0200
-Subject: [PATCH] Revert "ipq40xx: revert usage of VLAN S-TAG"
+Subject: [PATCH 22/43] Revert "ipq40xx: revert usage of VLAN S-TAG"
 This reverts commit cdc8d4b46f0811292fffc6094acd81e854b5f4a5.
--- a/patches/0023-ipq40xx-add-ath10k-ct-fw.cfg-stubs.patch
+++ b/patches/0023-ipq40xx-add-ath10k-ct-fw.cfg-stubs.patch
@@ -1,7 +1,7 @@
-From 558605338e87ebac7358026eb86b7ba5f4c228a1 Mon Sep 17 00:00:00 2001
+From f6f9f9f095bdd05c66f23357228b90a8daeedd14 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Thu, 25 Mar 2021 08:03:48 +0100
-Subject: [PATCH 23/23] ipq40xx: add ath10k-ct fw.cfg stubs
+Subject: [PATCH 23/43] ipq40xx: add ath10k-ct fw.cfg stubs
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
--- a/patches/0024-ipq40xx-fix-ecw5211-support.patch
+++ b/patches/0024-ipq40xx-fix-ecw5211-support.patch
@@ -1,25 +0,0 @@
 From c82870ef8a2ae4798ede9393254c1e18798e5d01 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Tue, 15 Jun 2021 17:03:14 +0200
 Subject: [PATCH] ipq40xx: fix ecw5211 support
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
 target/linux/ipq40xx/image/generic.mk | 1 +
 1 file changed, 1 insertion(+)
 diff --git a/target/linux/ipq40xx/image/generic.mk b/target/linux/ipq40xx/image/generic.mk
 index 1de17dd15a..487bba77b0 100644
 --- a/target/linux/ipq40xx/image/generic.mk
 +++ b/target/linux/ipq40xx/image/generic.mk
@@ -371,6 +371,7 @@ define Device/edgecore_ecw5211
 	SOC := qcom-ipq4018
 	BLOCKSIZE := 128k
 	PAGESIZE := 2048
 +	DEVICE_DTS_CONFIG := config@ap.dk01.1-c2
 	DEVICE_PACKAGES := kmod-tpm-i2c-atmel kmod-usb-acm uboot-envtools
 endef
 TARGET_DEVICES += edgecore_ecw5211
 -- 
 2.25.1
--- a/patches/0024-target-add-pstore-support.patch
+++ b/patches/0024-target-add-pstore-support.patch
@@ -1,23 +1,21 @@
-From e0ff8f29f0c0c147b34fe943698e8f95dfa6c688 Mon Sep 17 00:00:00 2001
+From 17dbf01adfa8cc4704873a57ae3676fe09f961fa Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Tue, 30 Mar 2021 19:03:43 +0200
-Subject: [PATCH 1/6] target: add pstore support
+Subject: [PATCH 24/43] target: add pstore support
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
 target/linux/generic/config-5.10                | 15 ++++++++++++++-
 target/linux/generic/config-5.4                 | 14 +++++++++++++-
 .../linux/ipq40xx/patches-5.4/903-pstore.patch  | 17 +++++++++++++++++
- .../patches-5.10/160-add-pstore-support.patch   | 17 +++++++++++++++++
+ 3 files changed, 44 insertions(+), 2 deletions(-)
 4 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 target/linux/ipq40xx/patches-5.4/903-pstore.patch
 create mode 100644 target/linux/mediatek/patches-5.10/160-add-pstore-support.patch
 diff --git a/target/linux/generic/config-5.10 b/target/linux/generic/config-5.10
-index ba6317e35f..3e911a2619 100644
+index 4eb5607f17..2582e8851a 100644
 --- a/target/linux/generic/config-5.10
 +++ b/target/linux/generic/config-5.10
-@@ -4424,7 +4424,20 @@ CONFIG_PROC_SYSCTL=y
+@@ -4506,7 +4506,20 @@ CONFIG_PROC_SYSCTL=y
 # CONFIG_PSAMPLE is not set
 # CONFIG_PSB6970_PHY is not set
 # CONFIG_PSI is not set
@@ -40,10 +38,10 @@ index ba6317e35f..3e911a2619 100644
 # CONFIG_PTP_1588_CLOCK is not set
 # CONFIG_PTP_1588_CLOCK_IDT82P33 is not set
 diff --git a/target/linux/generic/config-5.4 b/target/linux/generic/config-5.4
-index a0193ca718..da2cc8db65 100644
+index da0e2e2186..b6673ede4d 100644
 --- a/target/linux/generic/config-5.4
 +++ b/target/linux/generic/config-5.4
-@@ -4136,7 +4136,19 @@ CONFIG_PROC_SYSCTL=y
+@@ -4177,7 +4177,19 @@ CONFIG_PROC_SYSCTL=y
 # CONFIG_PSAMPLE is not set
 # CONFIG_PSB6970_PHY is not set
 # CONFIG_PSI is not set
--- a/patches/0025-ath79-add-Support-for-Indio-305AC.patch
+++ b/patches/0025-ath79-add-Support-for-Indio-305AC.patch
@@ -1,7 +1,7 @@
-From 008a385635cafdce3498ebd6a6b429a1aa2e03bd Mon Sep 17 00:00:00 2001
+From da01b2ec475761de8ac92045329483f8a9cf7438 Mon Sep 17 00:00:00 2001
 From: Rohan Nathi <rohan.nathi@indionetworks.com>
 Date: Thu, 24 Jun 2021 13:48:45 +0000
-Subject: [PATCH] ath79: add Support for Indio 305AC
+Subject: [PATCH 25/43] ath79: add Support for Indio 305AC
 Signed-off-by: Rohan Nathi <rohan.nathi@indionetworks.com>
 ---
@@ -134,10 +134,10 @@ index 0000000000..763fdcefa8
 +	mtd-cal-data = <&art 0x1000>;
 +};
 diff --git a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-index 5a44dd94e5..94afc9c726 100644
+index 783895525b..80f755b343 100644
 --- a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
 +++ b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-@@ -43,6 +43,7 @@ case "$FIRMWARE" in
+@@ -44,6 +44,7 @@ case "$FIRMWARE" in
 	ubnt,powerbeam-5ac-500|\
 	ubnt,powerbeam-5ac-gen2|\
 	ubnt,unifiac-pro|\
@@ -146,10 +146,10 @@ index 5a44dd94e5..94afc9c726 100644
 		caldata_extract "art" 0x5000 0x844
 		;;
 diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk
-index d93ebbaeba..da95360281 100644
+index ce4e462a40..24778e8f1c 100644
 --- a/target/linux/ath79/image/generic.mk
 +++ b/target/linux/ath79/image/generic.mk
-@@ -2191,6 +2191,17 @@ define Device/yuncore_a770
+@@ -2209,6 +2209,17 @@ define Device/yuncore_a770
 endef
 TARGET_DEVICES += yuncore_a770
--- a/patches/0026-ath79-tl-wpa8630p-fixes.patch
+++ b/patches/0026-ath79-tl-wpa8630p-fixes.patch
@@ -1,7 +1,7 @@
-From a14a7d3580ba376227eba8c28d7e632f0f4e1ffc Mon Sep 17 00:00:00 2001
+From 643d734b0d05bc9e5fe1b4588bf0876c9fd87bd4 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Wed, 30 Jun 2021 11:36:13 +0200
-Subject: [PATCH 35/36] ath79: tl-wpa8630p fixes
+Subject: [PATCH 26/43] ath79: tl-wpa8630p fixes
 * a certificates partition and change default port mapping
@@ -30,10 +30,10 @@ index 9e6d23de4e..c39dbc515b 100644
 };
 diff --git a/target/linux/ath79/generic/base-files/etc/board.d/02_network b/target/linux/ath79/generic/base-files/etc/board.d/02_network
-index b8bc38348e..f300077dba 100755
+index 31c0f11861..3ba3d72abc 100755
 --- a/target/linux/ath79/generic/base-files/etc/board.d/02_network
 +++ b/target/linux/ath79/generic/base-files/etc/board.d/02_network
-@@ -380,7 +380,7 @@ ath79_setup_interfaces()
+@@ -385,7 +385,7 @@ ath79_setup_interfaces()
 	tplink,tl-wpa8630p-v2.1-eu)
 		# port 5 (internal) is the power-line port
 		ucidef_add_switch "switch0" \
--- a/patches/0027-ath79-add-support-for-TP-Link-CPE710-v1.patch
+++ b/patches/0027-ath79-add-support-for-TP-Link-CPE710-v1.patch
@@ -1,7 +1,7 @@
-From 84b1c4894ff871686c4bd7152aca47a323857db6 Mon Sep 17 00:00:00 2001
+From 6ecffc2057aa1261846e51a3966b8710f605910a Mon Sep 17 00:00:00 2001
 From: Andrew Cameron <apcameron@softhome.net>
 Date: Mon, 12 Apr 2021 13:24:33 -0500
-Subject: [PATCH] ath79: add support for TP-Link CPE710-v1
+Subject: [PATCH 27/43] ath79: add support for TP-Link CPE710-v1
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -186,7 +186,7 @@ index 0000000000..830c3d30b8
 +	};
 +};
 diff --git a/target/linux/ath79/generic/base-files/etc/board.d/01_leds b/target/linux/ath79/generic/base-files/etc/board.d/01_leds
-index fae5ac7c92..5c7e39e48f 100755
+index 7c5eeb1112..05bdf60f78 100755
 --- a/target/linux/ath79/generic/base-files/etc/board.d/01_leds
 +++ b/target/linux/ath79/generic/base-files/etc/board.d/01_leds
@@ -164,7 +164,8 @@ enterasys,ws-ap3705i|\
@@ -200,7 +200,7 @@ index fae5ac7c92..5c7e39e48f 100755
 	;;
 compex,wpj344-16m|\
 diff --git a/target/linux/ath79/generic/base-files/etc/board.d/02_network b/target/linux/ath79/generic/base-files/etc/board.d/02_network
-index f300077dba..4fe605dee7 100755
+index 3ba3d72abc..d70432ad2b 100755
 --- a/target/linux/ath79/generic/base-files/etc/board.d/02_network
 +++ b/target/linux/ath79/generic/base-files/etc/board.d/02_network
@@ -63,6 +63,7 @@ ath79_setup_interfaces()
@@ -212,10 +212,10 @@ index f300077dba..4fe605dee7 100755
 	tplink,eap225-v3|\
 	tplink,eap245-v1|\
 diff --git a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-index 94afc9c726..fc110af75c 100644
+index 80f755b343..4d7940d6ba 100644
 --- a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
 +++ b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-@@ -228,6 +228,12 @@ case "$FIRMWARE" in
+@@ -229,6 +229,12 @@ case "$FIRMWARE" in
 		ln -sf /lib/firmware/ath10k/pre-cal-pci-0000\:00\:00.0.bin \
 			/lib/firmware/ath10k/QCA9888/hw2.0/board.bin
 		;;
@@ -229,7 +229,7 @@ index 94afc9c726..fc110af75c 100644
 	tplink,eap225-v3|\
 	tplink,eap225-wall-v2|\
 diff --git a/target/linux/ath79/image/generic-tp-link.mk b/target/linux/ath79/image/generic-tp-link.mk
-index 0058d74f77..e8c081eab1 100644
+index be6aa06b55..78340f650e 100644
 --- a/target/linux/ath79/image/generic-tp-link.mk
 +++ b/target/linux/ath79/image/generic-tp-link.mk
@@ -362,6 +362,17 @@ define Device/tplink_cpe610-v2
@@ -251,10 +251,10 @@ index 0058d74f77..e8c081eab1 100644
   $(Device/tplink-safeloader)
   LOADER_TYPE := elf
 diff --git a/tools/firmware-utils/src/tplink-safeloader.c b/tools/firmware-utils/src/tplink-safeloader.c
-index 2bc4a3cb82..2bba417dfc 100644
+index 70e21f99cb..c519a6d367 100644
 --- a/tools/firmware-utils/src/tplink-safeloader.c
 +++ b/tools/firmware-utils/src/tplink-safeloader.c
-@@ -537,6 +537,43 @@ static struct device_info boards[] = {
+@@ -530,6 +530,43 @@ static struct device_info boards[] = {
 		.first_sysupgrade_partition = "os-image",
 		.last_sysupgrade_partition = "support-list",
 	},
--- a/patches/0028-ipq4019-add-CIG-wf610d.patch
+++ b/patches/0028-ipq4019-add-CIG-wf610d.patch
@@ -1,7 +1,7 @@
-From 859bdaad5959f972babb268eff24901b116703c8 Mon Sep 17 00:00:00 2001
+From 7244d33107173856db10bb2084146137704e7e18 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
-Date: Tue, 13 Apr 2021 16:59:32 +0200
+Date: Sat, 4 Sep 2021 05:56:53 +0200
-Subject: [PATCH] ipq4019: add CIG wf610d
+Subject: [PATCH 28/43] ipq4019: add CIG wf610d
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
@@ -19,10 +19,10 @@ Signed-off-by: John Crispin <john@phrozen.org>
 create mode 100755 target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-cig-wf610d.dts
 diff --git a/package/firmware/ipq-wifi/Makefile b/package/firmware/ipq-wifi/Makefile
-index e5f10a1f98..513ad4ea67 100644
+index e3b25bb556..b996ee311f 100644
 --- a/package/firmware/ipq-wifi/Makefile
 +++ b/package/firmware/ipq-wifi/Makefile
-@@ -47,7 +47,8 @@ ALLWIFIBOARDS:= \
+@@ -49,7 +49,8 @@ ALLWIFIBOARDS:= \
 	nec_wg2600hp3 \
 	plasmacloud_pa1200 \
 	plasmacloud_pa2200 \
@@ -32,7 +32,7 @@ index e5f10a1f98..513ad4ea67 100644
 ALLWIFIPACKAGES:=$(foreach BOARD,$(ALLWIFIBOARDS),ipq-wifi-$(BOARD))
-@@ -131,5 +132,6 @@ $(eval $(call generate-ipq-wifi-package,nec_wg2600hp3,NEC Platforms WG2600HP3))
+@@ -135,5 +136,6 @@ $(eval $(call generate-ipq-wifi-package,nec_wg2600hp3,NEC Platforms WG2600HP3))
 $(eval $(call generate-ipq-wifi-package,plasmacloud_pa1200,Plasma Cloud PA1200))
 $(eval $(call generate-ipq-wifi-package,plasmacloud_pa2200,Plasma Cloud PA2200))
 $(eval $(call generate-ipq-wifi-package,qxwlan_e2600ac,Qxwlan E2600AC))
@@ -100,7 +100,7 @@ literal 0
 HcmV?d00001
 diff --git a/target/linux/ipq40xx/base-files/etc/board.d/01_leds b/target/linux/ipq40xx/base-files/etc/board.d/01_leds
-index 3e0f3ab258..f9674126ba 100755
+index ac11655904..c1d4e693f2 100755
 --- a/target/linux/ipq40xx/base-files/etc/board.d/01_leds
 +++ b/target/linux/ipq40xx/base-files/etc/board.d/01_leds
@@ -30,6 +30,7 @@ edgecore,oap100)
@@ -111,7 +111,7 @@ index 3e0f3ab258..f9674126ba 100755
 engenius,eap1300)
 	ucidef_set_led_netdev "lan" "LAN" "blue:lan" "eth0"
 	ucidef_set_led_wlan "wlan2g" "WLAN2G" "blue:wlan2g" "phy0tpt"
-@@ -61,6 +62,8 @@ qxwlan,e2600ac-c2)
+@@ -69,6 +70,8 @@ qxwlan,e2600ac-c2)
 	ucidef_set_led_wlan "wlan2g" "WLAN0" "green:wlan0" "phy0tpt"
 	ucidef_set_led_wlan "wlan5g" "WLAN1" "green:wlan1" "phy1tpt"
 	;;
@@ -121,10 +121,10 @@ index 3e0f3ab258..f9674126ba 100755
 zyxel,wre6606)
 	ucidef_set_led_wlan "wlan2g" "WLAN2G" "green:wlan2g" "phy0tpt"
 diff --git a/target/linux/ipq40xx/base-files/etc/board.d/02_network b/target/linux/ipq40xx/base-files/etc/board.d/02_network
-index 8b7364ff33..dcdb790c84 100755
+index 1d4c78833a..d62a2e5061 100755
 --- a/target/linux/ipq40xx/base-files/etc/board.d/02_network
 +++ b/target/linux/ipq40xx/base-files/etc/board.d/02_network
-@@ -41,6 +41,7 @@ ipq40xx_setup_interfaces()
+@@ -42,6 +42,7 @@ ipq40xx_setup_interfaces()
 		;;
 	asus,map-ac2200|\
 	cilab,meshpoint-one|\
@@ -133,7 +133,7 @@ index 8b7364ff33..dcdb790c84 100755
 	edgecore,oap100|\
 	openmesh,a42|\
 diff --git a/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-index 6670d310db..5eae9c6e80 100644
+index b7ee73b12e..3948c08984 100644
 --- a/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
 +++ b/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
@@ -93,6 +93,10 @@ case "$FIRMWARE" in
@@ -147,7 +147,7 @@ index 6670d310db..5eae9c6e80 100644
 	cellc,rtl30vw |\
 	compex,wpj419 |\
 	compex,wpj428 |\
-@@ -197,6 +201,10 @@ case "$FIRMWARE" in
+@@ -202,6 +206,10 @@ case "$FIRMWARE" in
 		caldata_extract "ART" 0x5000 0x2f20
 		ath10k_patch_mac $(mtd_get_mac_binary ORGDATA 0x2c)
 		;;
@@ -589,10 +589,10 @@ index 0000000000..e75e35e8ef
 +
 +};
 diff --git a/target/linux/ipq40xx/image/generic.mk b/target/linux/ipq40xx/image/generic.mk
-index 4e40b8be50..1de17dd15a 100644
+index a435a127fa..31f4971c90 100644
 --- a/target/linux/ipq40xx/image/generic.mk
 +++ b/target/linux/ipq40xx/image/generic.mk
-@@ -273,6 +273,20 @@ define Device/cilab_meshpoint-one
+@@ -271,6 +271,20 @@ define Device/cilab_meshpoint-one
 endef
 TARGET_DEVICES += cilab_meshpoint-one
@@ -614,19 +614,19 @@ index 4e40b8be50..1de17dd15a 100644
 	$(call Device/FitImage)
 	$(call Device/UbiFit)
 diff --git a/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch b/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch
-index a3d3341587..aec0d01ed6 100644
+index 6b7c68bf63..aa2fc4bd17 100644
 --- a/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch
 +++ b/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch
@@ -10,7 +10,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
-@@ -837,11 +837,58 @@ dtb-$(CONFIG_ARCH_QCOM) += \
+-@@ -837,11 +837,60 @@ dtb-$(CONFIG_ARCH_QCOM) += \
-+@@ -837,11 +837,59 @@ dtb-$(CONFIG_ARCH_QCOM) += \
+@@ -837,11 +837,61 @@ dtb-$(CONFIG_ARCH_QCOM) += \
  	qcom-apq8074-dragonboard.dtb \
  	qcom-apq8084-ifc6540.dtb \
  	qcom-apq8084-mtp.dtb \
-@@ -43,6 +43,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
+@@ -45,6 +45,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
  	qcom-ipq4019-ap.dk07.1-c1.dtb \
  	qcom-ipq4019-ap.dk07.1-c2.dtb \
 +	qcom-ipq4019-a62.dtb \
--- a/patches/0029-base-files-add-a-turnoff-command-to-the-led-script.patch
+++ b/patches/0029-base-files-add-a-turnoff-command-to-the-led-script.patch
@@ -1,7 +1,7 @@
-From 5da505e5f59e93a8a6e928ad6c09a076f9889af1 Mon Sep 17 00:00:00 2001
+From bc2e9052af84664a2caae0581aa745d09240b160 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Mon, 19 Apr 2021 13:49:20 +0200
-Subject: [PATCH 01/10] base-files: add a turnoff command to the led script
+Subject: [PATCH 29/43] base-files: add a turnoff command to the led script
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
--- a/patches/0030-ath10k-ct-update-the-driver.patch
+++ b/patches/0030-ath10k-ct-update-the-driver.patch
@@ -0,0 +1,30 @@
 From ed5a8958378d84bba92a70f2a56a962be73c4b3b Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Fri, 23 Apr 2021 16:16:31 +0200
 Subject: [PATCH 30/43] ath10k-ct: update the driver
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
 package/kernel/ath10k-ct/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 diff --git a/package/kernel/ath10k-ct/Makefile b/package/kernel/ath10k-ct/Makefile
 index 5681c5c2cd..24e0702e2c 100644
 --- a/package/kernel/ath10k-ct/Makefile
 +++ b/package/kernel/ath10k-ct/Makefile
@@ -8,9 +8,9 @@ PKG_LICENSE_FILES:=
 PKG_SOURCE_URL:=https://github.com/greearb/ath10k-ct.git
 PKG_SOURCE_PROTO:=git
 -PKG_SOURCE_DATE:=2021-06-03
 -PKG_SOURCE_VERSION:=b44cd7b2e7b0df5995ece18f358d4dfc40834ba1
 -PKG_MIRROR_HASH:=59f961ad425eb1a48fa9c391a325cc0f23845daec9d12673445d3077f9756cf0
 +PKG_SOURCE_DATE:=2021-04-23
 +PKG_SOURCE_VERSION:=8eca56d1514042b4af34004e0bbf69e40351d499
 +PKG_MIRROR_HASH:=4ce22470b0cd15cc3cb04478678407e976c48010baab517fa1ac37685b791d95
 # Build the 5.10 ath10k-ct driver version.
 # Probably this should match as closely as
 -- 
 2.25.1
--- a/patches/0031-ath10k-ct-update-the-driver.patch
+++ b/patches/0031-ath10k-ct-update-the-driver.patch
@@ -1,75 +0,0 @@
 From 644f52a193d0430e41d6c28c221e801a0e87affa Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Fri, 23 Apr 2021 16:16:31 +0200
 Subject: [PATCH] ath10k-ct: update the driver
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
 package/kernel/ath10k-ct/Makefile             |  6 +--
 ...64-ath10k-commit-rates-from-mac80211.patch | 37 -------------------
 2 files changed, 3 insertions(+), 40 deletions(-)
 delete mode 100644 package/kernel/ath10k-ct/patches/164-ath10k-commit-rates-from-mac80211.patch
 diff --git a/package/kernel/ath10k-ct/Makefile b/package/kernel/ath10k-ct/Makefile
 index a225bd8b19..8c2c36062d 100644
 --- a/package/kernel/ath10k-ct/Makefile
 +++ b/package/kernel/ath10k-ct/Makefile
@@ -8,9 +8,9 @@ PKG_LICENSE_FILES:=
 PKG_SOURCE_URL:=https://github.com/greearb/ath10k-ct.git
 PKG_SOURCE_PROTO:=git
 -PKG_SOURCE_DATE:=2021-01-11
 -PKG_SOURCE_VERSION:=9fe1df7d4f783b6b0cd1c99d11979e5a6e6fc40b
 -PKG_MIRROR_HASH:=4e30e256716611045e930b95eadaa8bfcadd5bdd8bbe3869cfe0f377920e812b
 +PKG_SOURCE_DATE:=2021-04-23
 +PKG_SOURCE_VERSION:=8eca56d1514042b4af34004e0bbf69e40351d499
 +PKG_MIRROR_HASH:=4ce22470b0cd15cc3cb04478678407e976c48010baab517fa1ac37685b791d95
 # Build the 5.10 ath10k-ct driver version.
 # Probably this should match as closely as
 diff --git a/package/kernel/ath10k-ct/patches/164-ath10k-commit-rates-from-mac80211.patch b/package/kernel/ath10k-ct/patches/164-ath10k-commit-rates-from-mac80211.patch
 deleted file mode 100644
 index 842f3ea2a5..0000000000
 --- a/package/kernel/ath10k-ct/patches/164-ath10k-commit-rates-from-mac80211.patch
 +++ /dev/null
@@ -1,37 +0,0 @@
 -From: Sven Eckelmann <sven@narfation.org>
 -Date: Tue, 26 Feb 2019 08:06:35 +0100
 -Subject: ath10k-ct: apply mac80211 rates to ath10k-ct rate state
 -
 -The rates from mac80211 have to be copied to the state of ath10k-ct or
 -otherwise the ath10k_check_apply_special_rates function overwrites
 -them again with some default values. This breaks for example the
 -mcast_rate set for a wifi-iface.
 -
 -Signed-off-by: Sven Eckelmann <sven@narfation.org>
 -
 ---- a/ath10k-5.10/mac.c
 -+++ b/ath10k-5.10/mac.c
 -@@ -6774,6 +6774,7 @@ static void ath10k_recalculate_mgmt_rate
 - 		return;
 - 	}
 - 
 -+	arvif->mgt_rate[def->chan->band] = hw_rate_code;
 - 	vdev_param = ar->wmi.vdev_param->mgmt_rate;
 - 	ret = ath10k_wmi_vdev_set_param(ar, arvif->vdev_id, vdev_param,
 - 					hw_rate_code);
 -@@ -7000,6 +7001,7 @@ static void ath10k_bss_info_changed(stru
 - 			   "mac vdev %d mcast_rate %x\n",
 - 			   arvif->vdev_id, rate);
 - 
 -+		arvif->mcast_rate[band] = rate;
 - 		vdev_param = ar->wmi.vdev_param->mcast_data_rate;
 - 		ret = ath10k_wmi_vdev_set_param(ar, arvif->vdev_id,
 - 						vdev_param, rate);
 -@@ -7008,6 +7010,7 @@ static void ath10k_bss_info_changed(stru
 - 				    "failed to set mcast rate on vdev %i: %d\n",
 - 				    arvif->vdev_id,  ret);
 - 
 -+		arvif->bcast_rate[band] = rate;
 - 		vdev_param = ar->wmi.vdev_param->bcast_data_rate;
 - 		ret = ath10k_wmi_vdev_set_param(ar, arvif->vdev_id,
 - 						vdev_param, rate);
 -- 
 2.25.1
--- a/patches/0031-ipq40xx-add-tplink-ec420-support.patch
+++ b/patches/0031-ipq40xx-add-tplink-ec420-support.patch
@@ -1,7 +1,7 @@
-From fa71a84201e148d5eb9c36cb7acb9d9d2fa8fca9 Mon Sep 17 00:00:00 2001
+From 0f91fe9eea8820e68b3d754e768a673ed165b3ce Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
-Date: Fri, 18 Jun 2021 11:07:02 +0200
+Date: Sat, 4 Sep 2021 05:59:39 +0200
-Subject: [PATCH 1/7] ipq40xx: add tplink ec420 support
+Subject: [PATCH 31/43] ipq40xx: add tplink ec420 support
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
@@ -34,10 +34,10 @@ index b24cbf979e..44a8688dbe 100644
 	ubootenv_add_uci_config "/dev/mtd6" "0x0" "0x10000" "0x10000"
 	;;
 diff --git a/package/firmware/ipq-wifi/Makefile b/package/firmware/ipq-wifi/Makefile
-index 513ad4ea67..87dcf9a769 100644
+index b996ee311f..c9d113ae6a 100644
 --- a/package/firmware/ipq-wifi/Makefile
 +++ b/package/firmware/ipq-wifi/Makefile
-@@ -48,7 +48,8 @@ ALLWIFIBOARDS:= \
+@@ -50,7 +50,8 @@ ALLWIFIBOARDS:= \
 	plasmacloud_pa1200 \
 	plasmacloud_pa2200 \
 	qxwlan_e2600ac \
@@ -47,7 +47,7 @@ index 513ad4ea67..87dcf9a769 100644
 ALLWIFIPACKAGES:=$(foreach BOARD,$(ALLWIFIBOARDS),ipq-wifi-$(BOARD))
-@@ -133,5 +134,6 @@ $(eval $(call generate-ipq-wifi-package,plasmacloud_pa1200,Plasma Cloud PA1200))
+@@ -137,5 +138,6 @@ $(eval $(call generate-ipq-wifi-package,plasmacloud_pa1200,Plasma Cloud PA1200))
 $(eval $(call generate-ipq-wifi-package,plasmacloud_pa2200,Plasma Cloud PA2200))
 $(eval $(call generate-ipq-wifi-package,qxwlan_e2600ac,Qxwlan E2600AC))
 $(eval $(call generate-ipq-wifi-package,cig_wf610d,CIG WF_610D))
@@ -1095,11 +1095,11 @@ literal 0
 HcmV?d00001
 diff --git a/target/linux/ipq40xx/base-files/etc/board.d/02_network b/target/linux/ipq40xx/base-files/etc/board.d/02_network
-index 597fa9f08b..238376afca 100755
+index d62a2e5061..16f6040b6e 100755
 --- a/target/linux/ipq40xx/base-files/etc/board.d/02_network
 +++ b/target/linux/ipq40xx/base-files/etc/board.d/02_network
-@@ -31,8 +31,9 @@ ipq40xx_setup_interfaces()
+@@ -32,8 +32,9 @@ ipq40xx_setup_interfaces()
- 	meraki,mr33|\
+ 	mikrotik,sxtsq-5-ac|\
 	netgear,ex6100v2|\
 	netgear,ex6150v2|\
 +	tp-link,ec420-g1|\
@@ -1110,7 +1110,7 @@ index 597fa9f08b..238376afca 100755
 	aruba,ap-303h)
 		ucidef_set_interfaces_lan_wan "eth0" "eth1"
 diff --git a/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-index 5eae9c6e80..8d3006381d 100644
+index 3948c08984..c8943d3ba3 100644
 --- a/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
 +++ b/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
@@ -46,6 +46,9 @@ case "$FIRMWARE" in
@@ -1123,7 +1123,7 @@ index 5eae9c6e80..8d3006381d 100644
 	esac
 	;;
 "ath10k/pre-cal-ahb-a000000.wifi.bin")
-@@ -154,6 +157,9 @@ case "$FIRMWARE" in
+@@ -159,6 +162,9 @@ case "$FIRMWARE" in
 		caldata_extract "ART" 0x1000 0x2f20
 		ath10k_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) -2)
 		;;
@@ -1133,7 +1133,7 @@ index 5eae9c6e80..8d3006381d 100644
 	esac
 	;;
 "ath10k/pre-cal-ahb-a800000.wifi.bin")
-@@ -262,11 +268,6 @@ case "$FIRMWARE" in
+@@ -273,11 +279,6 @@ case "$FIRMWARE" in
 		caldata_extract "ART" 0x5000 0x2f20
 		ath10k_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) -1)
 		;;
@@ -1146,7 +1146,7 @@ index 5eae9c6e80..8d3006381d 100644
 	;;
 *)
 diff --git a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh b/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
-index 5582696759..530545e442 100644
+index 54683977cd..cbdd12c750 100644
 --- a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
 +++ b/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
@@ -72,7 +72,8 @@ platform_do_upgrade() {
@@ -1441,10 +1441,10 @@ index 0000000000..9f6fdd5e76
 +};
 +
 diff --git a/target/linux/ipq40xx/image/generic.mk b/target/linux/ipq40xx/image/generic.mk
-index 487bba77b0..860b5e03bf 100644
+index 31f4971c90..ec3e779a44 100644
 --- a/target/linux/ipq40xx/image/generic.mk
 +++ b/target/linux/ipq40xx/image/generic.mk
-@@ -820,3 +820,18 @@ define Device/zyxel_wre6606
+@@ -816,3 +816,18 @@ define Device/zyxel_wre6606
 	DEVICE_PACKAGES := -kmod-ath10k-ct kmod-ath10k-ct-smallbuffers
 endef
 TARGET_DEVICES += zyxel_wre6606
--- a/patches/0032-ipq806x-update-to-latest-HEAD.patch
+++ b/patches/0032-ipq806x-update-to-latest-HEAD.patch
@@ -1,16 +1,15 @@
-From f50e63e5eb4a8b3a15985183c337301f87e5b6ed Mon Sep 17 00:00:00 2001
+From a16429d604a6c2cff7b2791e380fc57827485f03 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
-Date: Wed, 18 Aug 2021 12:13:29 +0200
+Date: Sat, 4 Sep 2021 06:01:17 +0200
-Subject: [PATCH] ipq806x: update to latest HEAD
+Subject: [PATCH 32/43] ipq806x: update to latest HEAD
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
 target/linux/ipq806x/Makefile                 |   1 +
 .../ipq806x/base-files/etc/board.d/01_leds    |   1 -
- .../ipq806x/base-files/etc/board.d/02_network |  22 +-
+ .../ipq806x/base-files/etc/board.d/02_network |  17 +-
 .../etc/hotplug.d/firmware/11-ath10k-caldata  |  58 +-
 .../ipq806x/base-files/etc/init.d/bootcount   |   7 +-
 .../ipq806x/base-files/etc/init.d/cpufreq     |  17 +
 .../base-files/lib/preinit/04_reorder_eth     |  13 +
 .../ipq806x/base-files/lib/upgrade/asrock.sh  |   4 +-
 .../base-files/lib/upgrade/platform.sh        |  19 +-
@@ -93,7 +92,6 @@ Signed-off-by: John Crispin <john@phrozen.org>
 ...-dt-Add-L2-frequency-scaling-support.patch | 199 ----
 ...056-cpufreq-dt-Add-missing-rcu-locks.patch |  23 -
 ...conflicts-with-OpenWrt-auto-mounting.patch |  23 -
 ...sens-support-configurable-interrupts.patch |   2 +-
 .../0069-arm-boot-add-dts-files.patch         |   3 +-
 .../083-ipq8064-dtsi-additions.patch          |  84 +-
 ...qcom-cpufreq-nvmem-support-specific-.patch |  51 +
@@ -106,8 +104,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
 ...conflicts-with-OpenWrt-auto-mounting.patch |  24 +
 .../patches-5.4/851-add-gsbi1-dts.patch       |   2 +-
 .../linux/ipq806x/patches-5.4/999-at803.patch |  12 -
- 101 files changed, 9212 insertions(+), 1367 deletions(-)
+ 99 files changed, 9190 insertions(+), 1365 deletions(-)
 create mode 100755 target/linux/ipq806x/base-files/etc/init.d/cpufreq
 create mode 100644 target/linux/ipq806x/base-files/lib/preinit/04_reorder_eth
 create mode 100644 target/linux/ipq806x/config-5.10
 create mode 100644 target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-rt4230w-rev6.dts
@@ -194,7 +191,7 @@ index 284f9e2c1d..74b94a29b4 100755
 # Copyright (C) 2015 OpenWrt.org
 #
 diff --git a/target/linux/ipq806x/base-files/etc/board.d/02_network b/target/linux/ipq806x/base-files/etc/board.d/02_network
-index ddef4b7ac6..1a1cec51aa 100755
+index 1e00b97092..1a1cec51aa 100755
 --- a/target/linux/ipq806x/base-files/etc/board.d/02_network
 +++ b/target/linux/ipq806x/base-files/etc/board.d/02_network
@@ -1,4 +1,3 @@
@@ -227,23 +224,7 @@ index ddef4b7ac6..1a1cec51aa 100755
 	;;
 linksys,ea7500-v1)
 	hw_mac_addr=$(mtd_get_mac_ascii devinfo hw_mac_addr)
-@@ -51,7 +57,6 @@ nec,wg2600hp3)
+@@ -73,7 +79,10 @@ ubnt,unifi-ac-hd)
 		"2:lan" "3:lan" "4:lan" "5:lan" "0@eth1" "1:wan" "6@eth0"
 	;;
 netgear,r7800 |\
 -tplink,ad7200 |\
 tplink,c2600)
 	ucidef_add_switch "switch0" \
 		"1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "6@eth1" "5:wan" "0@eth0"
@@ -66,11 +71,18 @@ qcom,ipq8064-db149)
 	ucidef_add_switch "switch0" \
 		"1:lan" "2:lan" "3:lan" "4:lan" "6u@eth1" "5:wan" "0u@eth0"
 	;;
 +tplink,ad7200)
 +	ucidef_add_switch "switch0" \
 +		"2:lan:1" "3:lan:2" "4:lan:3" "5:lan:4" "6@eth1" "1:wan" "0@eth0"
 +	;;
 ubnt,unifi-ac-hd)
 	ucidef_set_interface_lan "eth0 eth1"
 	;;
 zyxel,nbg6817)
@@ -404,29 +385,6 @@ index 7a54c34dba..cb32a4ed35 100755
 		;;
 	edgecore,ecw5410)
 		fw_setenv bootcount 0
 diff --git a/target/linux/ipq806x/base-files/etc/init.d/cpufreq b/target/linux/ipq806x/base-files/etc/init.d/cpufreq
 new file mode 100755
 index 0000000000..19278902ed
 --- /dev/null
 +++ b/target/linux/ipq806x/base-files/etc/init.d/cpufreq
@@ -0,0 +1,17 @@
 +#!/bin/sh /etc/rc.common
 +
 +START=15
 +
 +boot() {
 +  local governor
 +
 +  governor=$(cat /sys/devices/system/cpu/cpufreq/policy0/scaling_governor)
 +
 +  if [ "$governor" = "ondemand" ]; then
 +    # Effective only with ondemand
 +    echo 600000 > /sys/devices/system/cpu/cpufreq/policy0/scaling_min_freq
 +    echo 600000 > /sys/devices/system/cpu/cpufreq/policy1/scaling_min_freq
 +    echo 10 > /sys/devices/system/cpu/cpufreq/ondemand/sampling_down_factor
 +    echo 50 > /sys/devices/system/cpu/cpufreq/ondemand/up_threshold
 +  fi
 +}
 diff --git a/target/linux/ipq806x/base-files/lib/preinit/04_reorder_eth b/target/linux/ipq806x/base-files/lib/preinit/04_reorder_eth
 new file mode 100644
 index 0000000000..9f58473617
@@ -6662,7 +6620,7 @@ diff --git a/target/linux/ipq806x/patches-5.4/0002-dmaengine-Add-ADM-driver.patc
 similarity index 82%
 rename from target/linux/ipq806x/patches-5.4/0002-dmaengine-Add-ADM-driver.patch
 rename to target/linux/ipq806x/patches-5.10/100-v5.11-dmaengine-qcom-add_ADM_driver.patch
-index aa7d2e791e..2d24da01e4 100644
+index 7aa46526f2..2d24da01e4 100644
 --- a/target/linux/ipq806x/patches-5.4/0002-dmaengine-Add-ADM-driver.patch
 +++ b/target/linux/ipq806x/patches-5.10/100-v5.11-dmaengine-qcom-add_ADM_driver.patch
@@ -1,86 +1,88 @@
@@ -6714,7 +6672,7 @@ index aa7d2e791e..2d24da01e4 100644
 --- a/drivers/dma/qcom/Kconfig
 +++ b/drivers/dma/qcom/Kconfig
-@@ -28,3 +28,13 @@ config QCOM_HIDMA
+-@@ -29,3 +29,13 @@ config QCOM_HIDMA
 - 	  (user to kernel, kernel to kernel, etc.).  It only supports
 - 	  memcpy interface. The core is not intended for general
 - 	  purpose slave DMA.
@@ -9874,19 +9832,6 @@ index ff6f6edf49..0000000000
 - 		/*
 - 		 * The last SMEM partition may have its size marked as
 - 		 * something like 0xffffffff, which means "until the end of the
 diff --git a/target/linux/ipq806x/patches-5.4/0063-2-tsens-support-configurable-interrupts.patch b/target/linux/ipq806x/patches-5.4/0063-2-tsens-support-configurable-interrupts.patch
 index 585bd62a58..54488f25a8 100644
 --- a/target/linux/ipq806x/patches-5.4/0063-2-tsens-support-configurable-interrupts.patch
 +++ b/target/linux/ipq806x/patches-5.4/0063-2-tsens-support-configurable-interrupts.patch
@@ -163,7 +163,7 @@ Signed-off-by: Rajith Cherian <rajith@codeaurora.org>
  	mutex_unlock(&tzd->lock);
  	return tzd;
 -@@ -762,7 +802,10 @@ static const char * const trip_types[] =
 +@@ -765,7 +805,10 @@ static const char * const trip_types[] =
  	[THERMAL_TRIP_ACTIVE]	= "active",
  	[THERMAL_TRIP_PASSIVE]	= "passive",
  	[THERMAL_TRIP_HOT]	= "hot",
 diff --git a/target/linux/ipq806x/patches-5.4/0069-arm-boot-add-dts-files.patch b/target/linux/ipq806x/patches-5.4/0069-arm-boot-add-dts-files.patch
 index 055a4cbc30..b97d36fd7c 100644
 --- a/target/linux/ipq806x/patches-5.4/0069-arm-boot-add-dts-files.patch
--- a/patches/0033-feeds.conf.default-drop-luci.patch
+++ b/patches/0033-feeds.conf.default-drop-luci.patch
@@ -1,7 +1,7 @@
-From 1a20d4d44bf4601fef37aaf0e9f12d1bee89a022 Mon Sep 17 00:00:00 2001
+From a53506fd073dd451840c3c1974e579a8861f9205 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Tue, 4 May 2021 16:48:48 +0200
-Subject: [PATCH] feeds.conf.default: drop luci
+Subject: [PATCH 33/43] feeds.conf.default: drop luci
 we require luci-trunk for the gateway images.
--- a/patches/0034-ath79-various-fixes.patch
+++ b/patches/0034-ath79-various-fixes.patch
@@ -0,0 +1,38 @@
 From 83b7e4074c238cb64f727cde16cdfcc530aaa329 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Sat, 8 May 2021 11:30:32 +0200
 Subject: [PATCH 34/43] ath79: various fixes
 * free up additional 1MB rootfs space
 * make the target use bridge-vlan
 * use the single eth port as wan
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
 target/linux/ath79/generic/base-files/etc/board.d/02_network | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
 diff --git a/target/linux/ath79/generic/base-files/etc/board.d/02_network b/target/linux/ath79/generic/base-files/etc/board.d/02_network
 index d70432ad2b..b0b152ba74 100755
 --- a/target/linux/ath79/generic/base-files/etc/board.d/02_network
 +++ b/target/linux/ath79/generic/base-files/etc/board.d/02_network
@@ -95,7 +95,7 @@ ath79_setup_interfaces()
 	ubnt,unifi|\
 	wd,mynet-wifi-rangeextender|\
 	winchannel,wb2000)
 -		ucidef_set_interface_lan "eth0"
 +		ucidef_set_interface_wan "eth0"
 		;;
 	airtight,c-75)
 		ucidef_add_switch "switch0" \
@@ -675,6 +675,7 @@ ath79_setup_macs()
 board_config_update
 board=$(board_name)
 +ucidef_set_bridge_device bridge
 ath79_setup_interfaces $board
 ath79_setup_macs $board
 board_config_flush
 -- 
 2.25.1
--- a/patches/0035-ath79-various-fixes.patch
+++ b/patches/0035-ath79-various-fixes.patch
@@ -1,88 +0,0 @@
 From 167c998efc5ba755bafc1aca1bf68d9e694e4c10 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Sat, 8 May 2021 11:30:32 +0200
 Subject: [PATCH] ath79: various fixes
 * free up additional 1MB rootfs space
 * make the target use bridge-vlan
 * use the single eth port as wan
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
 target/linux/ath79/dts/ar9344_tplink_cpe.dtsi | 20 ++++++++-----------
 .../generic/base-files/etc/board.d/02_network |  3 ++-
 tools/firmware-utils/src/tplink-safeloader.c  |  4 ++--
 3 files changed, 12 insertions(+), 15 deletions(-)
 diff --git a/target/linux/ath79/dts/ar9344_tplink_cpe.dtsi b/target/linux/ath79/dts/ar9344_tplink_cpe.dtsi
 index d4b7de440a..c5ab963174 100644
 --- a/target/linux/ath79/dts/ar9344_tplink_cpe.dtsi
 +++ b/target/linux/ath79/dts/ar9344_tplink_cpe.dtsi
@@ -59,20 +59,16 @@
 			partition@40000 {
 				label = "firmware";
 				reg = <0x040000 0x780000>;
 +			};
 -				compatible = "fixed-partitions";
 -				#address-cells = <1>;
 -				#size-cells = <1>;
 -
 -				partition@0 {
 -					label = "kernel";
 -					reg = <0x000000 0x300000>;
 -				};
 +			partition@040000 {
 +				label = "kernel";
 +				reg = <0x040000 0x210000>;
 +			};
 -				partition@300000 {
 -					label = "rootfs";
 -					reg = <0x300000 0x480000>;
 -				};
 +			partition@340000 {
 +				label = "rootfs";
 +				reg = <0x250000 0x560000>;
 			};
 			partition@7c0000 {
 diff --git a/target/linux/ath79/generic/base-files/etc/board.d/02_network b/target/linux/ath79/generic/base-files/etc/board.d/02_network
 index 1e522b91c6..b8bc38348e 100755
 --- a/target/linux/ath79/generic/base-files/etc/board.d/02_network
 +++ b/target/linux/ath79/generic/base-files/etc/board.d/02_network
@@ -94,7 +94,7 @@ ath79_setup_interfaces()
 	ubnt,unifi|\
 	wd,mynet-wifi-rangeextender|\
 	winchannel,wb2000)
 -		ucidef_set_interface_lan "eth0"
 +		ucidef_set_interface_wan "eth0"
 		;;
 	airtight,c-75)
 		ucidef_add_switch "switch0" \
@@ -669,6 +669,7 @@ ath79_setup_macs()
 board_config_update
 board=$(board_name)
 +ucidef_set_bridge_device bridge
 ath79_setup_interfaces $board
 ath79_setup_macs $board
 board_config_flush
 diff --git a/tools/firmware-utils/src/tplink-safeloader.c b/tools/firmware-utils/src/tplink-safeloader.c
 index ac71b3305e..2bc4a3cb82 100644
 --- a/tools/firmware-utils/src/tplink-safeloader.c
 +++ b/tools/firmware-utils/src/tplink-safeloader.c
@@ -443,8 +443,8 @@ static struct device_info boards[] = {
 			{"default-mac", 0x30000, 0x00020},
 			{"product-info", 0x31100, 0x00100},
 			{"signature", 0x32000, 0x00400},
 -			{"os-image", 0x40000, 0x300000},
 -			{"file-system", 0x340000, 0x470000},
 +			{"os-image", 0x40000, 0x210000},
 +			{"file-system", 0x250000, 0x560000},
 			{"soft-version", 0x7b0000, 0x00100},
 			{"support-list", 0x7b1000, 0x00400},
 			{"user-config", 0x7c0000, 0x10000},
 -- 
 2.25.1
--- a/patches/0035-certificates-add-ability-to-persistently-store-certi.patch
+++ b/patches/0035-certificates-add-ability-to-persistently-store-certi.patch
@@ -1,7 +1,7 @@
-From 6d0385f31cc4f19df8fc51b56bb08af7c9c0922a Mon Sep 17 00:00:00 2001
+From ee837f028bd7af515d30a8a90cc2b5ee61eecf19 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
-Date: Sun, 23 May 2021 09:59:53 +0200
+Date: Sat, 4 Sep 2021 06:04:54 +0200
-Subject: [PATCH 07/11] certificates: add ability to persistently store
+Subject: [PATCH 35/43] certificates: add ability to persistently store
 certificates
 Signed-off-by: John Crispin <john@phrozen.org>
@@ -9,8 +9,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
 target/linux/ath79/dts/qca9563_tplink_cpe710-v1.dts        | 7 ++++++-
 .../files/arch/arm/boot/dts/qcom-ipq4019-xx8300.dtsi       | 3 +--
 .../linux/ramips/dts/mt7628an_tplink_8m-split-uboot.dtsi   | 7 ++++++-
- .../linux/realtek/dts/rtl8392_edgecore_ecs4100-12ph.dts   | 8 ++++++--
+ 3 files changed, 13 insertions(+), 4 deletions(-)
 4 files changed, 19 insertions(+), 6 deletions(-)
 diff --git a/target/linux/ath79/dts/qca9563_tplink_cpe710-v1.dts b/target/linux/ath79/dts/qca9563_tplink_cpe710-v1.dts
 index 830c3d30b8..71c6381f86 100644
@@ -63,28 +62,6 @@ index b6ce7b1f56..471be72001 100644
 			};
 			partition@7c0000 {
 diff --git a/target/linux/realtek/dts/rtl8392_edgecore_ecs4100-12ph.dts b/target/linux/realtek/dts/rtl8392_edgecore_ecs4100-12ph.dts
 index 303b79ac83..7a228aea86 100644
 --- a/target/linux/realtek/dts/rtl8392_edgecore_ecs4100-12ph.dts
 +++ b/target/linux/realtek/dts/rtl8392_edgecore_ecs4100-12ph.dts
@@ -176,11 +176,15 @@
 				reg = <0x100000 0x100000>;
 				read-only;
 			};
 -			partition@b260000 {
 +			partition@200000 {
 				label = "firmware";
 -				reg = <0x200000 0xe00000>;
 +				reg = <0x200000 0xdf0000>;
 				compatible = "openwrt,uimage", "denx,uimage";
 			};
 +			partition@ff0000 {
 +				label = "certificates";
 +				reg = <0xff0000 0x10000>;
 +			};
 		};
 	};
 };
 -- 
 2.25.1
--- a/patches/0036-ipq4018-add-EdgeCore-SPW2AC1200-support.patch
+++ b/patches/0036-ipq4018-add-EdgeCore-SPW2AC1200-support.patch
@@ -1,7 +1,7 @@
-From c651355c099a42c12f1953f4d027b32172a45bbb Mon Sep 17 00:00:00 2001
+From f7eed3ee6f7bb086a9bc0e049cc411d1bc98ed33 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
-Date: Thu, 1 Jul 2021 16:37:24 +0200
+Date: Sat, 4 Sep 2021 06:15:19 +0200
-Subject: [PATCH] ipq4018: add EdgeCore SPW2AC1200 support
+Subject: [PATCH 36/43] ipq4018: add EdgeCore SPW2AC1200 support
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
@@ -17,7 +17,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
 create mode 100644 target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-spw2ac1200.dts
 diff --git a/package/boot/uboot-envtools/files/ipq40xx b/package/boot/uboot-envtools/files/ipq40xx
-index b24cbf979e..ac66a7f2bd 100644
+index 44a8688dbe..ab489a6e18 100644
 --- a/package/boot/uboot-envtools/files/ipq40xx
 +++ b/package/boot/uboot-envtools/files/ipq40xx
@@ -34,6 +34,7 @@ case "$board" in
@@ -29,10 +29,10 @@ index b24cbf979e..ac66a7f2bd 100644
 glinet,gl-b1300 |\
 luma,wrtq-329acn |\
 diff --git a/target/linux/ipq40xx/base-files/etc/board.d/01_leds b/target/linux/ipq40xx/base-files/etc/board.d/01_leds
-index f9674126ba..efd5d002db 100755
+index c1d4e693f2..d473448137 100755
 --- a/target/linux/ipq40xx/base-files/etc/board.d/01_leds
 +++ b/target/linux/ipq40xx/base-files/etc/board.d/01_leds
-@@ -63,6 +63,7 @@ qxwlan,e2600ac-c2)
+@@ -71,6 +71,7 @@ qxwlan,e2600ac-c2)
 	ucidef_set_led_wlan "wlan5g" "WLAN1" "green:wlan1" "phy1tpt"
 	;;
 edgecore,ecw5211 |\
@@ -41,10 +41,10 @@ index f9674126ba..efd5d002db 100755
 zyxel,nbg6617 |\
 zyxel,wre6606)
 diff --git a/target/linux/ipq40xx/base-files/etc/board.d/02_network b/target/linux/ipq40xx/base-files/etc/board.d/02_network
-index 597fa9f08b..7bc8c5e6aa 100755
+index 16f6040b6e..0240798bbb 100755
 --- a/target/linux/ipq40xx/base-files/etc/board.d/02_network
 +++ b/target/linux/ipq40xx/base-files/etc/board.d/02_network
-@@ -43,6 +43,7 @@ ipq40xx_setup_interfaces()
+@@ -45,6 +45,7 @@ ipq40xx_setup_interfaces()
 	cilab,meshpoint-one|\
 	cig,wf610d|\
 	edgecore,ecw5211|\
@@ -53,10 +53,10 @@ index 597fa9f08b..7bc8c5e6aa 100755
 	openmesh,a42|\
 	openmesh,a62)
 diff --git a/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-index a9bbc791b8..da7931d018 100644
+index c8943d3ba3..ad2946f636 100644
 --- a/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
 +++ b/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-@@ -101,6 +101,7 @@ case "$FIRMWARE" in
+@@ -104,6 +104,7 @@ case "$FIRMWARE" in
 	compex,wpj419 |\
 	compex,wpj428 |\
 	edgecore,ecw5211 |\
@@ -64,7 +64,7 @@ index a9bbc791b8..da7931d018 100644
 	edgecore,oap100 |\
 	engenius,eap1300 |\
 	engenius,eap2200 |\
-@@ -212,6 +213,7 @@ case "$FIRMWARE" in
+@@ -220,6 +221,7 @@ case "$FIRMWARE" in
 	compex,wpj419 |\
 	compex,wpj428 |\
 	edgecore,ecw5211 |\
@@ -73,7 +73,7 @@ index a9bbc791b8..da7931d018 100644
 	engenius,eap1300 |\
 	engenius,eap2200 |\
 diff --git a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh b/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
-index 530545e442..f6fc828134 100644
+index cbdd12c750..84abd181dc 100644
 --- a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
 +++ b/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
@@ -76,7 +76,9 @@ platform_do_upgrade() {
@@ -426,10 +426,10 @@ index 0000000000..a152ba57f4
 +	status = "okay";
 +};
 diff --git a/target/linux/ipq40xx/image/generic.mk b/target/linux/ipq40xx/image/generic.mk
-index ee648edc50..e4e437bb95 100644
+index ec3e779a44..4448ed6083 100644
 --- a/target/linux/ipq40xx/image/generic.mk
 +++ b/target/linux/ipq40xx/image/generic.mk
-@@ -376,6 +376,19 @@ define Device/edgecore_ecw5211
+@@ -374,6 +374,19 @@ define Device/edgecore_ecw5211
 endef
 TARGET_DEVICES += edgecore_ecw5211
@@ -450,15 +450,15 @@ index ee648edc50..e4e437bb95 100644
 	$(call Device/FitImage)
 	$(call Device/UbiFit)
 diff --git a/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch b/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch
-index aec0d01ed6..492cc67b2c 100644
+index aa2fc4bd17..ae0b8f2025 100644
 --- a/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch
 +++ b/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch
@@ -10,7 +10,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
-@@ -837,11 +837,59 @@ dtb-$(CONFIG_ARCH_QCOM) += \
+-@@ -837,11 +837,61 @@ dtb-$(CONFIG_ARCH_QCOM) += \
-+@@ -837,11 +837,60 @@ dtb-$(CONFIG_ARCH_QCOM) += \
+@@ -837,11 +837,62 @@ dtb-$(CONFIG_ARCH_QCOM) += \
  	qcom-apq8074-dragonboard.dtb \
  	qcom-apq8084-ifc6540.dtb \
  	qcom-apq8084-mtp.dtb \
--- a/patches/0037-Revert-libusb-update-to-1.0.24.patch
+++ b/patches/0037-Revert-libusb-update-to-1.0.24.patch
@@ -0,0 +1,141 @@
 From 0cb58169aa1f1b29c0c713469bdc7b352cdf85f3 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Fri, 2 Jul 2021 12:02:04 +0200
 Subject: [PATCH 21/27] Revert "libusb: update to 1.0.24"
 This reverts commit 0798b13d7df0deafd005b14d52420c4f480d146e.
 ---
 package/libs/libusb/Makefile                  |  6 +-
 ...n-the-Changelog-and-clean-up-a-stray.patch | 29 ---------
 ...parsing-of-descriptors-for-multi-con.patch | 61 -------------------
 3 files changed, 3 insertions(+), 93 deletions(-)
 delete mode 100644 package/libs/libusb/patches/001-Correct-a-typo-in-the-Changelog-and-clean-up-a-stray.patch
 delete mode 100644 package/libs/libusb/patches/002-linux_usbfs-Fix-parsing-of-descriptors-for-multi-con.patch
 diff --git a/package/libs/libusb/Makefile b/package/libs/libusb/Makefile
 index 6b80b3848d..1667fb2840 100644
 --- a/package/libs/libusb/Makefile
 +++ b/package/libs/libusb/Makefile
@@ -8,14 +8,14 @@
 include $(TOPDIR)/rules.mk
 PKG_NAME:=libusb
 -PKG_VERSION:=1.0.24
 -PKG_RELEASE:=$(AUTORELEASE)
 +PKG_VERSION:=1.0.22
 +PKG_RELEASE:=2
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=\
   https://github.com/libusb/libusb/releases/download/v$(PKG_VERSION) \
   @SF/$(PKG_NAME)
 -PKG_HASH:=7efd2685f7b327326dcfb85cee426d9b871fd70e22caa15bb68d595ce2a2b12a
 +PKG_HASH:=75aeb9d59a4fdb800d329a545c2e6799f732362193b465ea198f2aa275518157
 PKG_MAINTAINER:= Felix Fietkau <nbd@nbd.name>
 PKG_LICENSE:=LGPL-2.1-or-later
 diff --git a/package/libs/libusb/patches/001-Correct-a-typo-in-the-Changelog-and-clean-up-a-stray.patch b/package/libs/libusb/patches/001-Correct-a-typo-in-the-Changelog-and-clean-up-a-stray.patch
 deleted file mode 100644
 index b17d6178d3..0000000000
 --- a/package/libs/libusb/patches/001-Correct-a-typo-in-the-Changelog-and-clean-up-a-stray.patch
 +++ /dev/null
@@ -1,29 +0,0 @@
 -From 369af149e3ad92514a2d24f112cedfeb7acaf558 Mon Sep 17 00:00:00 2001
 -From: Chris Dickens <christopher.a.dickens@gmail.com>
 -Date: Sun, 13 Dec 2020 15:46:27 -0800
 -Subject: [PATCH] Correct a typo in the Changelog and clean up a stray file
 -
 -Signed-off-by: Chris Dickens <christopher.a.dickens@gmail.com>
 ----
 - ChangeLog             | 2 +-
 - libusb/version_nano.h | 2 +-
 - test                  | 0
 - 3 files changed, 2 insertions(+), 2 deletions(-)
 - delete mode 100644 test
 -
 ---- a/ChangeLog
 -+++ b/ChangeLog
 -@@ -12,7 +12,7 @@ visit: http://log.libusb.info
 - * Darwin (macOS): use IOUSBDevice as darwin_device_class explicitly (#693)
 - * Linux: Drop support for kernel older than 2.6.32
 - * Linux: Provide an event thread name (#689)
 --* Linux: Wait until all USBs have been reaped before freeing them (#607)
 -+* Linux: Wait until all URBs have been reaped before freeing them (#607)
 - * NetBSD: Recognize device timeouts (#710)
 - * OpenBSD: Allow opening ugen devices multiple times (#763)
 - * OpenBSD: Support libusb_get_port_number() (#764)
 ---- a/libusb/version_nano.h
 -+++ b/libusb/version_nano.h
 -@@ -1 +1 @@
 --#define LIBUSB_NANO 11584
 -+#define LIBUSB_NANO 11585
 diff --git a/package/libs/libusb/patches/002-linux_usbfs-Fix-parsing-of-descriptors-for-multi-con.patch b/package/libs/libusb/patches/002-linux_usbfs-Fix-parsing-of-descriptors-for-multi-con.patch
 deleted file mode 100644
 index a53a8900de..0000000000
 --- a/package/libs/libusb/patches/002-linux_usbfs-Fix-parsing-of-descriptors-for-multi-con.patch
 +++ /dev/null
@@ -1,61 +0,0 @@
 -From f6d2cb561402c3b6d3627c0eb89e009b503d9067 Mon Sep 17 00:00:00 2001
 -From: Chris Dickens <christopher.a.dickens@gmail.com>
 -Date: Sun, 13 Dec 2020 15:49:19 -0800
 -Subject: [PATCH] linux_usbfs: Fix parsing of descriptors for
 - multi-configuration devices
 -
 -Commit e2be556bd2 ("linux_usbfs: Parse config descriptors during device
 -initialization") introduced a regression for devices with multiple
 -configurations. The logic that verifies the reported length of the
 -configuration descriptors failed to count the length of the
 -configuration descriptor itself and would truncate the actual length by
 -9 bytes, leading to a parsing error for subsequent descriptors.
 -
 -Closes #825
 -
 -Signed-off-by: Chris Dickens <christopher.a.dickens@gmail.com>
 ----
 - libusb/os/linux_usbfs.c | 12 ++++++++----
 - libusb/version_nano.h   |  2 +-
 - 2 files changed, 9 insertions(+), 5 deletions(-)
 -
 ---- a/libusb/os/linux_usbfs.c
 -+++ b/libusb/os/linux_usbfs.c
 -@@ -641,7 +641,12 @@ static int seek_to_next_config(struct li
 - 	uint8_t *buffer, size_t len)
 - {
 - 	struct usbi_descriptor_header *header;
 --	int offset = 0;
 -+	int offset;
 -+
 -+	/* Start seeking past the config descriptor */
 -+	offset = LIBUSB_DT_CONFIG_SIZE;
 -+	buffer += LIBUSB_DT_CONFIG_SIZE;
 -+	len -= LIBUSB_DT_CONFIG_SIZE;
 - 
 - 	while (len > 0) {
 - 		if (len < 2) {
 -@@ -718,7 +723,7 @@ static int parse_config_descriptors(stru
 - 		}
 - 
 - 		if (priv->sysfs_dir) {
 --			 /*
 -+			/*
 - 			 * In sysfs wTotalLength is ignored, instead the kernel returns a
 - 			 * config descriptor with verified bLength fields, with descriptors
 - 			 * with an invalid bLength removed.
 -@@ -727,8 +732,7 @@ static int parse_config_descriptors(stru
 - 			int offset;
 - 
 - 			if (num_configs > 1 && idx < num_configs - 1) {
 --				offset = seek_to_next_config(ctx, buffer + LIBUSB_DT_CONFIG_SIZE,
 --							     remaining - LIBUSB_DT_CONFIG_SIZE);
 -+				offset = seek_to_next_config(ctx, buffer, remaining);
 - 				if (offset < 0)
 - 					return offset;
 - 				sysfs_config_len = (uint16_t)offset;
 ---- a/libusb/version_nano.h
 -+++ b/libusb/version_nano.h
 -@@ -1 +1 @@
 --#define LIBUSB_NANO 11585
 -+#define LIBUSB_NANO 11586
 -- 
 2.25.1
--- a/patches/0038-Revert-libusb-update-to-1.0.24.patch
+++ b/patches/0038-Revert-libusb-update-to-1.0.24.patch
@@ -1,35 +0,0 @@
 From 4f4e6eec1cab67d6cea9bfa61da5fbbd1a21fdee Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Fri, 2 Jul 2021 12:02:04 +0200
 Subject: [PATCH] Revert "libusb: update to 1.0.24"
 This reverts commit 0798b13d7df0deafd005b14d52420c4f480d146e.
 ---
 package/libs/libusb/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 diff --git a/package/libs/libusb/Makefile b/package/libs/libusb/Makefile
 index e931536339..1667fb2840 100644
 --- a/package/libs/libusb/Makefile
 +++ b/package/libs/libusb/Makefile
@@ -8,14 +8,14 @@
 include $(TOPDIR)/rules.mk
 PKG_NAME:=libusb
 -PKG_VERSION:=1.0.24
 -PKG_RELEASE:=1
 +PKG_VERSION:=1.0.22
 +PKG_RELEASE:=2
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=\
   https://github.com/libusb/libusb/releases/download/v$(PKG_VERSION) \
   @SF/$(PKG_NAME)
 -PKG_HASH:=7efd2685f7b327326dcfb85cee426d9b871fd70e22caa15bb68d595ce2a2b12a
 +PKG_HASH:=75aeb9d59a4fdb800d329a545c2e6799f732362193b465ea198f2aa275518157
 PKG_MAINTAINER:= Felix Fietkau <nbd@nbd.name>
 PKG_LICENSE:=LGPL-2.1-or-later
 -- 
 2.25.1
--- a/patches/0038-firewall-enable-ssh-on-wan-during-early-boot-stage.patch
+++ b/patches/0038-firewall-enable-ssh-on-wan-during-early-boot-stage.patch
@@ -1,7 +1,7 @@
-From 1147a7312c432eebe0de619463fae582051e2e97 Mon Sep 17 00:00:00 2001
+From a7bfcdcf6675076c1a8a71aac6e2d8793345e8a6 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Mon, 12 Jul 2021 13:10:48 +0200
-Subject: [PATCH 37/37] firewall: enable ssh on wan during early boot stage
+Subject: [PATCH 38/43] firewall: enable ssh on wan during early boot stage
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
--- a/patches/0039-netifd-fix-compile-on-older-kernels.patch
+++ b/patches/0039-netifd-fix-compile-on-older-kernels.patch
@@ -1,7 +1,7 @@
-From 5bf7a4a5befe6add789249fe02b737e353137146 Mon Sep 17 00:00:00 2001
+From 4b7e51305fcbf27d8c447e165484f513f9ec7185 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Wed, 4 Aug 2021 08:36:30 +0200
-Subject: [PATCH] netifd: fix compile on older kernels
+Subject: [PATCH 39/43] netifd: fix compile on older kernels
 The ethtool features do not exist on ancient qualcomm kernels.
 Disable that feature if running on QCA.
--- a/patches/0040-ipq40xx-add-Wallys-DR40x9-support.patch
+++ b/patches/0040-ipq40xx-add-Wallys-DR40x9-support.patch
@@ -1,7 +1,7 @@
-From 5a0366889960ae89594177854b77889cdf22ac63 Mon Sep 17 00:00:00 2001
+From 5a9dfd7deb119a2960b062afb9c1a5e7ddc4cf2e Mon Sep 17 00:00:00 2001
 From: Robert Marko <robert.marko@sartura.hr>
-Date: Fri, 13 Aug 2021 18:28:21 +0200
+Date: Sat, 4 Sep 2021 06:19:42 +0200
-Subject: [PATCH] ipq40xx: add Wallys DR40x9 support
+Subject: [PATCH 40/43] ipq40xx: add Wallys DR40x9 support
 Adds support for the Wallys DR40x9 series boards.
 They come in IPQ4019 and IPQ4029 versions.
@@ -54,10 +54,10 @@ Signed-off-by: Robert Marko <robert.marko@sartura.hr>
 create mode 100644 target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq40x9-dr40x9.dts
 diff --git a/package/firmware/ipq-wifi/Makefile b/package/firmware/ipq-wifi/Makefile
-index 87dcf9a769..192e8dcf7e 100644
+index c9d113ae6a..b222ce30d6 100644
 --- a/package/firmware/ipq-wifi/Makefile
 +++ b/package/firmware/ipq-wifi/Makefile
-@@ -49,6 +49,7 @@ ALLWIFIBOARDS:= \
+@@ -51,6 +51,7 @@ ALLWIFIBOARDS:= \
 	plasmacloud_pa2200 \
 	qxwlan_e2600ac \
 	cig_wf610d \
@@ -65,7 +65,7 @@ index 87dcf9a769..192e8dcf7e 100644
 	tp-link_ec420-g1
 ALLWIFIPACKAGES:=$(foreach BOARD,$(ALLWIFIBOARDS),ipq-wifi-$(BOARD))
-@@ -135,5 +136,6 @@ $(eval $(call generate-ipq-wifi-package,plasmacloud_pa2200,Plasma Cloud PA2200))
+@@ -139,5 +140,6 @@ $(eval $(call generate-ipq-wifi-package,plasmacloud_pa2200,Plasma Cloud PA2200))
 $(eval $(call generate-ipq-wifi-package,qxwlan_e2600ac,Qxwlan E2600AC))
 $(eval $(call generate-ipq-wifi-package,cig_wf610d,CIG WF_610D))
 $(eval $(call generate-ipq-wifi-package,tp-link_ec420-g1,tp-link EC420-G1))
@@ -135,7 +135,7 @@ literal 0
 HcmV?d00001
 diff --git a/target/linux/ipq40xx/base-files/etc/board.d/02_network b/target/linux/ipq40xx/base-files/etc/board.d/02_network
-index 9d03b620ce..cfcf518907 100755
+index 0240798bbb..5a2a3a47f7 100755
 --- a/target/linux/ipq40xx/base-files/etc/board.d/02_network
 +++ b/target/linux/ipq40xx/base-files/etc/board.d/02_network
@@ -19,7 +19,8 @@ ipq40xx_setup_interfaces()
@@ -163,7 +163,7 @@ index c255707f91..e1f75fd4bd 100755
 board_config_flush
 diff --git a/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-index 56b9935541..561c8289e7 100644
+index ad2946f636..64bb4efaf8 100644
 --- a/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
 +++ b/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
@@ -115,7 +115,8 @@ case "$FIRMWARE" in
@@ -176,7 +176,7 @@ index 56b9935541..561c8289e7 100644
 		caldata_extract "0:ART" 0x1000 0x2f20
 		;;
 	devolo,magic-2-wifi-next)
-@@ -227,7 +228,8 @@ case "$FIRMWARE" in
+@@ -232,7 +233,8 @@ case "$FIRMWARE" in
 	plasmacloud,pa2200 |\
 	qxwlan,e2600ac-c1 |\
 	qxwlan,e2600ac-c2 |\
@@ -187,7 +187,7 @@ index 56b9935541..561c8289e7 100644
 		;;
 	devolo,magic-2-wifi-next)
 diff --git a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh b/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
-index f6fc828134..7ebe0396f6 100644
+index 84abd181dc..8840372ba9 100644
 --- a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
 +++ b/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
@@ -73,6 +73,7 @@ platform_do_upgrade() {
@@ -592,10 +592,10 @@ index 0000000000..cb3296f5e5
 +	status = "okay";
 +};
 diff --git a/target/linux/ipq40xx/image/generic.mk b/target/linux/ipq40xx/image/generic.mk
-index e4e437bb95..7cbfecb233 100644
+index 4448ed6083..540f1f2778 100644
 --- a/target/linux/ipq40xx/image/generic.mk
 +++ b/target/linux/ipq40xx/image/generic.mk
-@@ -834,6 +834,19 @@ define Device/zyxel_wre6606
+@@ -830,6 +830,19 @@ define Device/zyxel_wre6606
 endef
 TARGET_DEVICES += zyxel_wre6606
@@ -616,19 +616,19 @@ index e4e437bb95..7cbfecb233 100644
 	$(call Device/FitImage)
 	$(call Device/UbiFit)
 diff --git a/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch b/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch
-index 492cc67b2c..4d686df304 100644
+index ae0b8f2025..826e17b0e9 100644
 --- a/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch
 +++ b/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch
@@ -10,7 +10,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
-@@ -837,11 +837,60 @@ dtb-$(CONFIG_ARCH_QCOM) += \
+-@@ -837,11 +837,62 @@ dtb-$(CONFIG_ARCH_QCOM) += \
-+@@ -837,11 +837,61 @@ dtb-$(CONFIG_ARCH_QCOM) += \
+@@ -837,11 +837,63 @@ dtb-$(CONFIG_ARCH_QCOM) += \
  	qcom-apq8074-dragonboard.dtb \
  	qcom-apq8084-ifc6540.dtb \
  	qcom-apq8084-mtp.dtb \
-@@ -68,6 +68,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
+@@ -70,6 +70,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
 +	qcom-ipq4029-gl-b1300.dtb \
 +	qcom-ipq4029-gl-s1300.dtb \
 +	qcom-ipq4029-mr33.dtb \
--- a/patches/0041-base-files-fix-rootfs_data_max-support-during-sysupg.patch
+++ b/patches/0041-base-files-fix-rootfs_data_max-support-during-sysupg.patch
@@ -1,7 +1,8 @@
-From b673b8dad0cb6392c7097dfe75b2919b13ecd1c6 Mon Sep 17 00:00:00 2001
+From 35412c4626e6b2195421452926dd9b2854bceb9a Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Tue, 17 Aug 2021 17:29:22 +0200
-Subject: [PATCH] base-files: fix rootfs_data_max support during sysupgrade
+Subject: [PATCH 41/43] base-files: fix rootfs_data_max support during
 sysupgrade
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
--- a/patches/0042-ipq40xx-add-HFCL-ION4-support.patch
+++ b/patches/0042-ipq40xx-add-HFCL-ION4-support.patch
@@ -1,7 +1,7 @@
-From f9a7699980b31760712245ea1dab0641ac7425e1 Mon Sep 17 00:00:00 2001
+From 5804d7fe3e3860c33a6957320661efd40b077a9e Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Thu, 26 Aug 2021 17:34:47 +0200
-Subject: [PATCH] ipq40xx: add HFCL ION4 support
+Subject: [PATCH 42/43] ipq40xx: add HFCL ION4 support
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
@@ -34,10 +34,10 @@ index ab489a6e18..fd7ad69eff 100644
 config_load ubootenv
 diff --git a/package/firmware/ipq-wifi/Makefile b/package/firmware/ipq-wifi/Makefile
-index 23fc4caa2e..e887e5ad1c 100644
+index b222ce30d6..cd7bfc3c82 100644
 --- a/package/firmware/ipq-wifi/Makefile
 +++ b/package/firmware/ipq-wifi/Makefile
-@@ -51,7 +51,8 @@ ALLWIFIBOARDS:= \
+@@ -52,7 +52,8 @@ ALLWIFIBOARDS:= \
 	qxwlan_e2600ac \
 	cig_wf610d \
 	wallys_dr40x9 \
@@ -47,7 +47,7 @@ index 23fc4caa2e..e887e5ad1c 100644
 ALLWIFIPACKAGES:=$(foreach BOARD,$(ALLWIFIBOARDS),ipq-wifi-$(BOARD))
-@@ -139,5 +140,6 @@ $(eval $(call generate-ipq-wifi-package,qxwlan_e2600ac,Qxwlan E2600AC))
+@@ -141,5 +142,6 @@ $(eval $(call generate-ipq-wifi-package,qxwlan_e2600ac,Qxwlan E2600AC))
 $(eval $(call generate-ipq-wifi-package,cig_wf610d,CIG WF_610D))
 $(eval $(call generate-ipq-wifi-package,tp-link_ec420-g1,tp-link EC420-G1))
 $(eval $(call generate-ipq-wifi-package,wallys_dr40x9,Wallys DR40X9))
@@ -55,10 +55,10 @@ index 23fc4caa2e..e887e5ad1c 100644
 $(foreach PACKAGE,$(ALLWIFIPACKAGES),$(eval $(call BuildPackage,$(PACKAGE))))
 diff --git a/target/linux/ipq40xx/base-files/etc/board.d/01_leds b/target/linux/ipq40xx/base-files/etc/board.d/01_leds
-index efd5d002db..85fa1bcfbf 100755
+index d473448137..d944d72184 100755
 --- a/target/linux/ipq40xx/base-files/etc/board.d/01_leds
 +++ b/target/linux/ipq40xx/base-files/etc/board.d/01_leds
-@@ -70,6 +70,10 @@ zyxel,wre6606)
+@@ -78,6 +78,10 @@ zyxel,wre6606)
 	ucidef_set_led_wlan "wlan2g" "WLAN2G" "green:wlan2g" "phy0tpt"
 	ucidef_set_led_wlan "wlan5g" "WLAN5G" "green:wlan5g" "phy1tpt"
 	;;
@@ -70,10 +70,10 @@ index efd5d002db..85fa1bcfbf 100755
 board_config_flush
 diff --git a/target/linux/ipq40xx/base-files/etc/board.d/02_network b/target/linux/ipq40xx/base-files/etc/board.d/02_network
-index cfcf518907..84596dcf88 100755
+index 5a2a3a47f7..e4b009bf93 100755
 --- a/target/linux/ipq40xx/base-files/etc/board.d/02_network
 +++ b/target/linux/ipq40xx/base-files/etc/board.d/02_network
-@@ -33,6 +33,7 @@ ipq40xx_setup_interfaces()
+@@ -34,6 +34,7 @@ ipq40xx_setup_interfaces()
 	netgear,ex6100v2|\
 	netgear,ex6150v2|\
 	tp-link,ec420-g1|\
@@ -82,10 +82,10 @@ index cfcf518907..84596dcf88 100755
 		ucidef_set_interface_wan "eth0"
 		;;
 diff --git a/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-index 561c8289e7..d38decf77b 100644
+index 64bb4efaf8..97dd1b4039 100644
 --- a/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
 +++ b/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-@@ -162,6 +162,9 @@ case "$FIRMWARE" in
+@@ -167,6 +167,9 @@ case "$FIRMWARE" in
 	tp-link,ec420-g1)
 		caldata_extract "0:ART" 0x1000 0x2f20
 		;;
@@ -95,7 +95,7 @@ index 561c8289e7..d38decf77b 100644
 	esac
 	;;
 "ath10k/pre-cal-ahb-a800000.wifi.bin")
-@@ -272,6 +275,9 @@ case "$FIRMWARE" in
+@@ -283,6 +286,9 @@ case "$FIRMWARE" in
 		caldata_extract "ART" 0x5000 0x2f20
 		ath10k_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) -1)
 		;;
@@ -106,7 +106,7 @@ index 561c8289e7..d38decf77b 100644
 	;;
 *)
 diff --git a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh b/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
-index 7ebe0396f6..c404f32f41 100644
+index 8840372ba9..53bc1adeb5 100644
 --- a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
 +++ b/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
@@ -74,6 +74,7 @@ platform_do_upgrade() {
@@ -350,10 +350,10 @@ index 0000000000..7437b98c02
 +	vlan_tag = <0 0x20>;
 +};
 diff --git a/target/linux/ipq40xx/image/generic.mk b/target/linux/ipq40xx/image/generic.mk
-index 93a896e75d..ac7a5c7dfa 100644
+index 540f1f2778..ae1e2e49cf 100644
 --- a/target/linux/ipq40xx/image/generic.mk
 +++ b/target/linux/ipq40xx/image/generic.mk
-@@ -861,3 +861,21 @@ define Device/tp-link_ec420_g1
+@@ -857,3 +857,21 @@ define Device/tp-link_ec420_g1
 	DEVICE_PACKAGES := ath10k-firmware-qca9984-ct ipq-wifi-tp-link_ec420-g1 uboot-envtools
 endef
 TARGET_DEVICES += tp-link_ec420_g1
--- a/patches/0043-ipq806x-add-edgecore_ssw2ac2600-support.patch
+++ b/patches/0043-ipq806x-add-edgecore_ssw2ac2600-support.patch
@@ -1,7 +1,7 @@
-From e5f38285a39a57f3f6faa6450e8b9e9847dfcc7a Mon Sep 17 00:00:00 2001
+From 282fff50a526b7eef8f4ffbaf9c2a01c407920ad Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Wed, 18 Aug 2021 15:49:56 +0200
-Subject: [PATCH] ipq806x: add edgecore_ssw2ac2600 support
+Subject: [PATCH 43/43] ipq806x: add edgecore_ssw2ac2600 support
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
@@ -33,7 +33,7 @@ index 96a4ee6450..1b49fd51d4 100644
 	ubootenv_add_uci_config "/dev/mtd11" "0x0" "0x10000" "0x10000"
 	;;
 diff --git a/package/firmware/ipq-wifi/Makefile b/package/firmware/ipq-wifi/Makefile
-index 192e8dcf7e..23fc4caa2e 100644
+index cd7bfc3c82..a400ac9470 100644
 --- a/package/firmware/ipq-wifi/Makefile
 +++ b/package/firmware/ipq-wifi/Makefile
@@ -33,6 +33,7 @@ ALLWIFIBOARDS:= \
@@ -44,7 +44,7 @@ index 192e8dcf7e..23fc4caa2e 100644
 	edgecore_oap100 \
 	engenius_eap2200 \
 	engenius_emd1 \
-@@ -119,6 +120,7 @@ $(eval $(call generate-ipq-wifi-package,cellc_rtl30vw, Cell C RTL30VW))
+@@ -122,6 +123,7 @@ $(eval $(call generate-ipq-wifi-package,cellc_rtl30vw, Cell C RTL30VW))
 $(eval $(call generate-ipq-wifi-package,devolo_magic-2-wifi-next,devolo Magic 2 WiFi next))
 $(eval $(call generate-ipq-wifi-package,dlink_dap2610,D-Link DAP-2610))
 $(eval $(call generate-ipq-wifi-package,edgecore_ecw5410,Edgecore ECW5410))