Revert "config.yml: bump OpenWrt baseline to latest 21.02"

This reverts commit 53c2b41a58.
2025-10-29 01:22:25 +00:00 · 2021-08-12 17:07:51 +02:00
parent 53c2b41a58
commit ec5396f9c0
22 changed files with 4576 additions and 490 deletions
--- 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 f967d2f243f7d13201025480372b8a829d7f32d6 Mon Sep 17 00:00:00 2001
+From 583b54e2f10ee14b5756d7035e641f7a1bb3095c 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/53] mediatek: update to latest trunk version
+Subject: [PATCH 01/43] 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 282cd0bab5..e6696bd50a 100644
+index b873bdc40c..2d7f82ce23 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 282cd0bab5..e6696bd50a 100644
 # CONFIG_FUJITSU_ERRATUM_010001 is not set
 CONFIG_FW_LOADER_PAGED_BUF=y
 CONFIG_GENERIC_ALLOCATOR=y
-@@ -267,103 +201,20 @@ CONFIG_GLOB=y
+@@ -267,102 +201,19 @@ CONFIG_GLOB=y
 CONFIG_GPIOLIB=y
 CONFIG_GRO_CELLS=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
@@ -102184,7 +102184,6 @@ index 282cd0bab5..e6696bd50a 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
@@ -102220,7 +102219,7 @@ index 282cd0bab5..e6696bd50a 100644
 CONFIG_IO_URING=y
 CONFIG_IRQCHIP=y
 CONFIG_IRQ_DOMAIN=y
-@@ -371,9 +222,10 @@ CONFIG_IRQ_DOMAIN_HIERARCHY=y
+@@ -370,9 +221,10 @@ CONFIG_IRQ_DOMAIN_HIERARCHY=y
 CONFIG_IRQ_FORCED_THREADING=y
 CONFIG_IRQ_TIME_ACCOUNTING=y
 CONFIG_IRQ_WORK=y
@@ -102232,7 +102231,7 @@ index 282cd0bab5..e6696bd50a 100644
 CONFIG_LOCK_DEBUGGING_SUPPORT=y
 CONFIG_LOCK_SPIN_ON_OWNER=y
 CONFIG_LZO_COMPRESS=y
-@@ -381,21 +233,25 @@ CONFIG_LZO_DECOMPRESS=y
+@@ -380,21 +232,25 @@ CONFIG_LZO_DECOMPRESS=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_MDIO_BUS=y
 CONFIG_MDIO_DEVICE=y
@@ -102260,7 +102259,7 @@ index 282cd0bab5..e6696bd50a 100644
 CONFIG_MTD_RAW_NAND=y
 CONFIG_MTD_SPI_NAND=y
 CONFIG_MTD_SPI_NOR=y
-@@ -423,7 +279,6 @@ CONFIG_NET_DSA=y
+@@ -422,7 +278,6 @@ CONFIG_NET_DSA=y
 CONFIG_NET_DSA_MT7530=y
 CONFIG_NET_DSA_TAG_MTK=y
 CONFIG_NET_FLOW_LIMIT=y
@@ -102268,7 +102267,7 @@ index 282cd0bab5..e6696bd50a 100644
 CONFIG_NET_MEDIATEK_SOC=y
 CONFIG_NET_SWITCHDEV=y
 CONFIG_NET_VENDOR_MEDIATEK=y
-@@ -448,7 +303,6 @@ CONFIG_PARTITION_PERCPU=y
+@@ -447,7 +302,6 @@ CONFIG_PARTITION_PERCPU=y
 CONFIG_PCI=y
 CONFIG_PCIEAER=y
 CONFIG_PCIEASPM=y
@@ -102276,7 +102275,7 @@ index 282cd0bab5..e6696bd50a 100644
 # CONFIG_PCIEASPM_DEFAULT is not set
 CONFIG_PCIEASPM_PERFORMANCE=y
 # CONFIG_PCIEASPM_POWERSAVE is not set
-@@ -461,6 +315,7 @@ CONFIG_PCI_DOMAINS=y
+@@ -460,6 +314,7 @@ CONFIG_PCI_DOMAINS=y
 CONFIG_PCI_DOMAINS_GENERIC=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_MSI_IRQ_DOMAIN=y
@@ -102284,7 +102283,7 @@ index 282cd0bab5..e6696bd50a 100644
 CONFIG_PGTABLE_LEVELS=3
 CONFIG_PHYLIB=y
 CONFIG_PHYLINK=y
-@@ -478,7 +333,7 @@ CONFIG_PINCTRL_MT7622=y
+@@ -477,7 +332,7 @@ CONFIG_PINCTRL_MT7622=y
 CONFIG_PINCTRL_MT8516=y
 CONFIG_PINCTRL_MTK=y
 CONFIG_PINCTRL_MTK_MOORE=y
@@ -102293,7 +102292,7 @@ index 282cd0bab5..e6696bd50a 100644
 CONFIG_PM=y
 CONFIG_PM_CLK=y
 CONFIG_PM_GENERIC_DOMAINS=y
-@@ -488,6 +343,20 @@ CONFIG_POWER_RESET=y
+@@ -487,6 +342,20 @@ CONFIG_POWER_RESET=y
 CONFIG_POWER_RESET_SYSCON=y
 CONFIG_POWER_SUPPLY=y
 CONFIG_PRINTK_TIME=y
@@ -102314,7 +102313,7 @@ index 282cd0bab5..e6696bd50a 100644
 CONFIG_PWM=y
 CONFIG_PWM_MEDIATEK=y
 # CONFIG_PWM_MTK_DISP is not set
-@@ -500,7 +369,9 @@ CONFIG_RATIONAL=y
+@@ -499,7 +368,9 @@ CONFIG_RATIONAL=y
 CONFIG_RCU_NEED_SEGCBLIST=y
 CONFIG_RCU_STALL_COMMON=y
 CONFIG_REALTEK_PHY=y
@@ -102325,7 +102324,7 @@ index 282cd0bab5..e6696bd50a 100644
 CONFIG_REGMAP=y
 CONFIG_REGMAP_MMIO=y
 CONFIG_REGULATOR=y
-@@ -555,7 +426,6 @@ CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
+@@ -552,7 +423,6 @@ CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
 CONFIG_THERMAL_EMULATION=y
 CONFIG_THERMAL_GOV_BANG_BANG=y
 CONFIG_THERMAL_GOV_FAIR_SHARE=y
@@ -102333,7 +102332,7 @@ index 282cd0bab5..e6696bd50a 100644
 CONFIG_THERMAL_GOV_STEP_WISE=y
 CONFIG_THERMAL_GOV_USER_SPACE=y
 CONFIG_THERMAL_OF=y
-@@ -587,6 +457,9 @@ CONFIG_WATCHDOG_PRETIMEOUT_GOV_PANIC=y
+@@ -584,6 +454,9 @@ CONFIG_WATCHDOG_PRETIMEOUT_GOV_PANIC=y
 CONFIG_WATCHDOG_PRETIMEOUT_GOV_SEL=m
 CONFIG_WATCHDOG_SYSFS=y
 CONFIG_XPS=y
--- a/backports/0008-realtek-update-to-latest-owrt-HEAD.patch
+++ b/backports/0008-realtek-update-to-latest-owrt-HEAD.patch
@@ -1,39 +1,40 @@
-From 3351962effe2bc5e8a6a2eda06ca35f69c19a03a Mon Sep 17 00:00:00 2001
+From cd5d073a6469beb8e7a3a267672e34baa73cbd83 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Tue, 16 Mar 2021 10:46:51 +0100
-Subject: [PATCH] realtek: update to latest owrt HEAD
+Subject: [PATCH 01/40] realtek: update to latest owrt HEAD
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
- package/boot/uboot-envtools/files/realtek     |   5 +
+ package/boot/uboot-envtools/files/realtek     |   7 +
 .../realtek/base-files/etc/board.d/01_leds    |   1 -
 .../realtek/base-files/etc/board.d/02_network |   3 +
- target/linux/realtek/config-5.4               |  29 +-
+ target/linux/realtek/config-5.4               |  31 +-
 .../realtek/dts/rtl8380_zyxel_gs1900-10hp.dts |  20 +-
 .../dts/rtl8392_edgecore_ecs4100-12ph.dts     | 297 +++++++++
 target/linux/realtek/dts/rtl839x.dtsi         | 197 ++++++
 .../include/asm/mach-rtl838x/mach-rtl83xx.h   |  23 +-
 .../files-5.4/arch/mips/rtl838x/setup.c       |  18 -
 .../files-5.4/drivers/gpio/edgecore_reboot.c  |  61 ++
 .../files-5.4/drivers/gpio/gpio-rtl838x.c     |   3 +
- .../drivers/net/dsa/rtl83xx/common.c          |  28 +-
+ .../drivers/net/dsa/rtl83xx/common.c          |  39 +-
- .../files-5.4/drivers/net/dsa/rtl83xx/dsa.c   | 567 ++++++++++++-----
+ .../files-5.4/drivers/net/dsa/rtl83xx/dsa.c   | 609 +++++++++++++-----
- .../drivers/net/dsa/rtl83xx/rtl838x.c         | 581 ++++++++++++++----
+ .../drivers/net/dsa/rtl83xx/rtl838x.c         | 581 +++++++++++++----
 .../drivers/net/dsa/rtl83xx/rtl838x.h         |  56 +-
 .../drivers/net/dsa/rtl83xx/rtl839x.c         | 540 ++++++++++++----
 .../drivers/net/dsa/rtl83xx/rtl930x.c         | 506 +++++++++++++--
- .../drivers/net/dsa/rtl83xx/rtl931x.c         |  69 ++-
+ .../drivers/net/dsa/rtl83xx/rtl931x.c         |  69 +-
- .../drivers/net/ethernet/rtl838x_eth.c        | 127 +++-
+ .../drivers/net/ethernet/rtl838x_eth.c        | 155 +++--
 .../drivers/net/ethernet/rtl838x_eth.h        |   1 +
- .../files-5.4/drivers/net/phy/rtl83xx-phy.c   | 562 ++++++++++-------
+ .../files-5.4/drivers/net/phy/rtl83xx-phy.c   | 562 +++++++++-------
 target/linux/realtek/image/Makefile           |   9 +
 .../301-gpio-add-rtl838x-driver.patch         |   2 +-
- ...0-gpio-Add-Realtek-Otto-GPIO-support.patch | 412 +++++++++++++
+ ...0-gpio-Add-Realtek-Otto-GPIO-support.patch | 412 ++++++++++++
 .../realtek/patches-5.4/706-sysled.patch      | 294 +++++++++
 .../realtek/patches-5.4/707-reboot.patch      |   9 +
 .../realtek/patches-5.4/708-poor-stp.patch    |  16 +
 .../realtek/patches-5.4/710-adt7470.patch     |  22 +
 .../realtek/patches-5.4/711-ec4100.patch      |  41 ++
- 28 files changed, 3717 insertions(+), 762 deletions(-)
+ 29 files changed, 3785 insertions(+), 799 deletions(-)
 create mode 100644 target/linux/realtek/dts/rtl8392_edgecore_ecs4100-12ph.dts
 create mode 100644 target/linux/realtek/dts/rtl839x.dtsi
 create mode 100644 target/linux/realtek/files-5.4/drivers/gpio/edgecore_reboot.c
@@ -45,10 +46,17 @@ Signed-off-by: John Crispin <john@phrozen.org>
 create mode 100644 target/linux/realtek/patches-5.4/711-ec4100.patch
 diff --git a/package/boot/uboot-envtools/files/realtek b/package/boot/uboot-envtools/files/realtek
-index a91ca82604..7b73679104 100644
+index cce0628ffc..a4b7089d62 100644
 --- a/package/boot/uboot-envtools/files/realtek
 +++ b/package/boot/uboot-envtools/files/realtek
-@@ -19,6 +19,11 @@ zyxel,gs1900-10hp)
+@@ -11,11 +11,18 @@ case "$board" in
 d-link,dgs-1210-16|\
 d-link,dgs-1210-28|\
 d-link,dgs-1210-10p|\
 +zyxel,gs1900-8hp-v1|\
 +zyxel,gs1900-8hp-v2|\
 zyxel,gs1900-10hp)
 	idx="$(find_mtd_index u-boot-env)"
 	[ -n "$idx" ] && \
 		ubootenv_add_uci_config "/dev/mtd$idx" "0x0" "0x400" "0x10000"
 	;;
@@ -71,7 +79,7 @@ index 699ab817dd..36ca01a696 100755
 board=$(board_name)
 diff --git a/target/linux/realtek/base-files/etc/board.d/02_network b/target/linux/realtek/base-files/etc/board.d/02_network
-index 45ab84ee9e..2052bab60a 100755
+index 2568fd2e0e..2b82ccb0aa 100755
 --- a/target/linux/realtek/base-files/etc/board.d/02_network
 +++ b/target/linux/realtek/base-files/etc/board.d/02_network
@@ -49,6 +49,9 @@ done
@@ -85,7 +93,7 @@ index 45ab84ee9e..2052bab60a 100755
 	ucidef_set_poe 130 "$lan_list"
 	;;
 diff --git a/target/linux/realtek/config-5.4 b/target/linux/realtek/config-5.4
-index 51025d5d89..34943f5b54 100644
+index 2fbd904376..3f72b911cc 100644
 --- a/target/linux/realtek/config-5.4
 +++ b/target/linux/realtek/config-5.4
@@ -2,17 +2,18 @@ CONFIG_ARCH_32BIT_OFF_T=y
@@ -136,7 +144,14 @@ index 51025d5d89..34943f5b54 100644
 CONFIG_GRO_CELLS=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_HARDWARE_WATCHPOINTS=y
-@@ -89,6 +88,7 @@ CONFIG_HZ_PERIODIC=y
+@@ -82,12 +81,14 @@ CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT_MAP=y
 # CONFIG_HIGH_RES_TIMERS is not set
 +CONFIG_HWMON=y
 CONFIG_HZ=250
 CONFIG_HZ_250=y
 CONFIG_HZ_PERIODIC=y
 CONFIG_I2C=y
 CONFIG_I2C_ALGOBIT=y
 CONFIG_I2C_BOARDINFO=y
@@ -144,7 +159,12 @@ index 51025d5d89..34943f5b54 100644
 CONFIG_I2C_GPIO=y
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_IRQCHIP=y
-@@ -107,6 +107,8 @@ CONFIG_MDIO_BUS=y
+@@ -101,10 +102,13 @@ CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
 CONFIG_LIBFDT=y
 CONFIG_LOCK_DEBUGGING_SUPPORT=y
 +CONFIG_MARVELL_PHY=y
 CONFIG_MDIO_BUS=y
 CONFIG_MDIO_DEVICE=y
 CONFIG_MDIO_I2C=y
 CONFIG_MEMFD_CREATE=y
@@ -153,10 +173,10 @@ index 51025d5d89..34943f5b54 100644
 CONFIG_MFD_SYSCON=y
 CONFIG_MIGRATION=y
 CONFIG_MIPS=y
-@@ -162,11 +164,17 @@ CONFIG_POWER_RESET=y
+@@ -159,11 +163,17 @@ CONFIG_PINCTRL=y
 CONFIG_POWER_RESET=y
 CONFIG_POWER_RESET_SYSCON=y
 CONFIG_PSB6970_PHY=y
 CONFIG_REALTEK_PHY=y
 +CONFIG_RATIONAL=y
 +CONFIG_REALTEK_PHY=y
 +CONFIG_REALTEK_SOC_PHY=y
@@ -171,7 +191,7 @@ index 51025d5d89..34943f5b54 100644
 CONFIG_SERIAL_MCTRL_GPIO=y
 CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_SFP=y
-@@ -175,7 +183,7 @@ CONFIG_SPI_MASTER=y
+@@ -172,7 +182,7 @@ CONFIG_SPI_MASTER=y
 CONFIG_SPI_MEM=y
 CONFIG_SPI_RTL838X=y
 CONFIG_SRCU=y
@@ -180,7 +200,7 @@ index 51025d5d89..34943f5b54 100644
 CONFIG_SWPHY=y
 CONFIG_SYSCTL_EXCEPTION_TRACE=y
 CONFIG_SYS_HAS_CPU_MIPS32_R1=y
-@@ -187,8 +195,11 @@ CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
+@@ -184,8 +194,11 @@ CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
 CONFIG_SYS_SUPPORTS_MIPS16=y
 CONFIG_TARGET_ISA_REV=2
 CONFIG_TICK_CPU_ACCOUNTING=y
@@ -192,6 +212,44 @@ index 51025d5d89..34943f5b54 100644
 +CONFIG_WATCHDOG_CORE=y
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_ZLIB_INFLATE=y
 diff --git a/target/linux/realtek/dts/rtl8380_zyxel_gs1900-10hp.dts b/target/linux/realtek/dts/rtl8380_zyxel_gs1900-10hp.dts
 index 92d0e25fc4..a590450055 100644
 --- a/target/linux/realtek/dts/rtl8380_zyxel_gs1900-10hp.dts
 +++ b/target/linux/realtek/dts/rtl8380_zyxel_gs1900-10hp.dts
@@ -55,29 +55,17 @@
 		port@24 {
 			reg = <24>;
 			label = "lan9";
 -			phy-mode = "rgmii-id";
 -			phy-handle = <&phy24>;
 +			phy-mode = "1000base-x";
 +			managed = "in-band-status";
 			sfp = <&sfp0>;
 -
 -			fixed-link {
 -				speed = <1000>;
 -				full-duplex;
 -				pause;
 -			};
 		};
 		port@26 {
 			reg = <26>;
 			label = "lan10";
 -			phy-mode = "rgmii-id";
 -			phy-handle = <&phy26>;
 +			phy-mode = "1000base-x";
 +			managed = "in-band-status";
 			sfp = <&sfp1>;
 -
 -			fixed-link {
 -				speed = <1000>;
 -				full-duplex;
 -				pause;
 -			};
 		};
 	};
 };
 diff --git a/target/linux/realtek/dts/rtl8392_edgecore_ecs4100-12ph.dts b/target/linux/realtek/dts/rtl8392_edgecore_ecs4100-12ph.dts
 new file mode 100644
 index 0000000000..303b79ac83
@@ -858,7 +916,7 @@ index 8207e4bb73..60b6f08834 100644
 		pr_debug("Found RTL8393 GPIO\n");
 		break;
 diff --git a/target/linux/realtek/files-5.4/drivers/net/dsa/rtl83xx/common.c b/target/linux/realtek/files-5.4/drivers/net/dsa/rtl83xx/common.c
-index 6940afa7f2..a380906b92 100644
+index 698f2892ea..a380906b92 100644
 --- a/target/linux/realtek/files-5.4/drivers/net/dsa/rtl83xx/common.c
 +++ b/target/linux/realtek/files-5.4/drivers/net/dsa/rtl83xx/common.c
@@ -18,27 +18,6 @@ extern const struct dsa_switch_ops rtl930x_switch_ops;
@@ -906,7 +964,26 @@ index 6940afa7f2..a380906b92 100644
 	sw_w32(cmd, r->addr);
 	do { } while (sw_r32(r->addr) & BIT(r->c_bit + 1));
 }
-@@ -593,6 +569,7 @@ static int __init rtl83xx_sw_probe(struct platform_device *pdev)
+@@ -368,8 +344,8 @@ static int __init rtl83xx_mdio_probe(struct rtl838x_switch_priv *priv)
 	/* Enable PHY control via SoC */
 	if (priv->family_id == RTL8380_FAMILY_ID) {
 -		/* Enable PHY control via SoC */
 -		sw_w32_mask(0, BIT(15), RTL838X_SMI_GLB_CTRL);
 +		/* Enable SerDes NWAY and PHY control via SoC */
 +		sw_w32_mask(BIT(7), BIT(15), RTL838X_SMI_GLB_CTRL);
 	} else {
 		/* Disable PHY polling via SoC */
 		sw_w32_mask(BIT(7), 0, RTL839X_SMI_GLB_CTRL);
@@ -555,7 +531,6 @@ static int __init rtl83xx_sw_probe(struct platform_device *pdev)
 	int err = 0, i;
 	struct rtl838x_switch_priv *priv;
 	struct device *dev = &pdev->dev;
 -	u64 irq_mask;
 	u64 bpdu_mask;
 	pr_debug("Probing RTL838X switch device\n");
@@ -594,6 +569,7 @@ static int __init rtl83xx_sw_probe(struct platform_device *pdev)
 		priv->fib_entries = 8192;
 		rtl8380_get_version(priv);
 		priv->n_lags = 8;
@@ -914,7 +991,7 @@ index 6940afa7f2..a380906b92 100644
 		break;
 	case RTL8390_FAMILY_ID:
 		priv->ds->ops = &rtl83xx_switch_ops;
-@@ -605,6 +582,7 @@ static int __init rtl83xx_sw_probe(struct platform_device *pdev)
+@@ -606,6 +582,7 @@ static int __init rtl83xx_sw_probe(struct platform_device *pdev)
 		priv->fib_entries = 16384;
 		rtl8390_get_version(priv);
 		priv->n_lags = 16;
@@ -922,7 +999,7 @@ index 6940afa7f2..a380906b92 100644
 		break;
 	case RTL9300_FAMILY_ID:
 		priv->ds->ops = &rtl930x_switch_ops;
-@@ -618,6 +596,7 @@ static int __init rtl83xx_sw_probe(struct platform_device *pdev)
+@@ -619,6 +596,7 @@ static int __init rtl83xx_sw_probe(struct platform_device *pdev)
 		priv->version = RTL8390_VERSION_A;
 		priv->n_lags = 16;
 		sw_w32(1, RTL930X_ST_CTRL);
@@ -930,7 +1007,7 @@ index 6940afa7f2..a380906b92 100644
 		break;
 	case RTL9310_FAMILY_ID:
 		priv->ds->ops = &rtl930x_switch_ops;
-@@ -630,6 +609,7 @@ static int __init rtl83xx_sw_probe(struct platform_device *pdev)
+@@ -631,6 +609,7 @@ static int __init rtl83xx_sw_probe(struct platform_device *pdev)
 		priv->fib_entries = 16384;
 		priv->version = RTL8390_VERSION_A;
 		priv->n_lags = 16;
@@ -938,8 +1015,21 @@ index 6940afa7f2..a380906b92 100644
 		break;
 	}
 	pr_debug("Chip version %c\n", priv->version);
@@ -650,9 +629,9 @@ static int __init rtl83xx_sw_probe(struct platform_device *pdev)
 	/* Enable link and media change interrupts. Are the SERDES masks needed? */
 	sw_w32_mask(0, 3, priv->r->isr_glb_src);
 -	
 -	priv->r->set_port_reg_le(irq_mask, priv->r->isr_port_link_sts_chg);
 -	priv->r->set_port_reg_le(irq_mask, priv->r->imr_port_link_sts_chg);
 +
 +	priv->r->set_port_reg_le(priv->irq_mask, priv->r->isr_port_link_sts_chg);
 +	priv->r->set_port_reg_le(priv->irq_mask, priv->r->imr_port_link_sts_chg);
 	priv->link_state_irq = platform_get_irq(pdev, 0);
 	pr_info("LINK state irq: %d\n", priv->link_state_irq);
 diff --git a/target/linux/realtek/files-5.4/drivers/net/dsa/rtl83xx/dsa.c b/target/linux/realtek/files-5.4/drivers/net/dsa/rtl83xx/dsa.c
-index 987b47dc8f..721b1817a5 100644
+index e0832c42b8..c5f243c55a 100644
 --- a/target/linux/realtek/files-5.4/drivers/net/dsa/rtl83xx/dsa.c
 +++ b/target/linux/realtek/files-5.4/drivers/net/dsa/rtl83xx/dsa.c
@@ -26,50 +26,6 @@ static void rtl83xx_init_stats(struct rtl838x_switch_priv *priv)
@@ -1077,7 +1167,7 @@ index 987b47dc8f..721b1817a5 100644
 	ds->configure_vlan_while_not_filtering = true;
 	rtl83xx_enable_phy_polling(priv);
-@@ -242,7 +232,7 @@ static void rtl83xx_phylink_validate(struct dsa_switch *ds, int port,
+@@ -242,9 +232,10 @@ static void rtl83xx_phylink_validate(struct dsa_switch *ds, int port,
 	struct rtl838x_switch_priv *priv = ds->priv;
 	__ETHTOOL_DECLARE_LINK_MODE_MASK(mask) = { 0, };
@@ -1085,8 +1175,11 @@ index 987b47dc8f..721b1817a5 100644
 +	pr_debug("In %s port %d, state is %d", __func__, port, state->interface);
 	if (!phy_interface_mode_is_rgmii(state->interface) &&
- 	    state->interface != PHY_INTERFACE_MODE_NA &&
+	    state->interface != PHY_INTERFACE_MODE_NA &&
-@@ -279,6 +269,10 @@ static void rtl83xx_phylink_validate(struct dsa_switch *ds, int port,
+ 	    state->interface != PHY_INTERFACE_MODE_1000BASEX &&
 	    state->interface != PHY_INTERFACE_MODE_MII &&
 	    state->interface != PHY_INTERFACE_MODE_REVMII &&
@@ -278,6 +269,10 @@ static void rtl83xx_phylink_validate(struct dsa_switch *ds, int port,
 	if (port >= 24 && port <= 27 && priv->family_id == RTL8380_FAMILY_ID)
 		phylink_set(mask, 1000baseX_Full);
@@ -1097,7 +1190,16 @@ index 987b47dc8f..721b1817a5 100644
 	phylink_set(mask, 10baseT_Half);
 	phylink_set(mask, 10baseT_Full);
 	phylink_set(mask, 100baseT_Half);
-@@ -330,7 +324,8 @@ static int rtl83xx_phylink_mac_link_state(struct dsa_switch *ds, int port,
+@@ -310,7 +305,7 @@ static int rtl83xx_phylink_mac_link_state(struct dsa_switch *ds, int port,
 	link = priv->r->get_port_reg_le(priv->r->mac_link_sts);
 	if (link & BIT_ULL(port))
 		state->link = 1;
 -	pr_info("%s: link state: %llx\n", __func__, link & BIT_ULL(port));
 +	pr_debug("%s: link state port %d: %llx\n", __func__, port, link & BIT_ULL(port));
 	state->duplex = 0;
 	if (priv->r->get_port_reg_le(priv->r->mac_link_dup_sts) & BIT_ULL(port))
@@ -329,7 +324,8 @@ static int rtl83xx_phylink_mac_link_state(struct dsa_switch *ds, int port,
 		state->speed = SPEED_1000;
 		break;
 	case 3:
@@ -1107,15 +1209,64 @@ index 987b47dc8f..721b1817a5 100644
 			state->speed = SPEED_2500;
 		else
 			state->speed = SPEED_100; /* Is in fact 500Mbit */
-@@ -344,7 +339,6 @@ static int rtl83xx_phylink_mac_link_state(struct dsa_switch *ds, int port,
+@@ -343,6 +339,43 @@ static int rtl83xx_phylink_mac_link_state(struct dsa_switch *ds, int port,
 	return 1;
 }
-
+static void rtl83xx_config_interface(int port, phy_interface_t interface)
- static void rtl83xx_config_interface(int port, phy_interface_t interface)
+{
- {
+	u32 old, int_shift, sds_shift;
- 	u32 old, int_shift, sds_shift;
+
-@@ -549,8 +543,11 @@ static int rtl83xx_port_enable(struct dsa_switch *ds, int port,
+	switch (port) {
 +	case 24:
 +		int_shift = 0;
 +		sds_shift = 5;
 +		break;
 +	case 26:
 +		int_shift = 3;
 +		sds_shift = 0;
 +		break;
 +	default:
 +		return;
 +	}
 +
 +	old = sw_r32(RTL838X_SDS_MODE_SEL);
 +	switch (interface) {
 +	case PHY_INTERFACE_MODE_1000BASEX:
 +		if ((old >> sds_shift & 0x1f) == 4)
 +			return;
 +		sw_w32_mask(0x7 << int_shift, 1 << int_shift, RTL838X_INT_MODE_CTRL);
 +		sw_w32_mask(0x1f << sds_shift, 4 << sds_shift, RTL838X_SDS_MODE_SEL);
 +		break;
 +	case PHY_INTERFACE_MODE_SGMII:
 +		if ((old >> sds_shift & 0x1f) == 2)
 +			return;
 +		sw_w32_mask(0x7 << int_shift, 2 << int_shift, RTL838X_INT_MODE_CTRL);
 +		sw_w32_mask(0x1f << sds_shift, 2 << sds_shift, RTL838X_SDS_MODE_SEL);
 +		break;
 +	default:
 +		return;
 +	}
 +	pr_debug("configured port %d for interface %s\n", port, phy_modes(interface));
 +}
 +
 static void rtl83xx_phylink_mac_config(struct dsa_switch *ds, int port,
 					unsigned int mode,
 					const struct phylink_link_state *state)
@@ -376,10 +409,11 @@ static void rtl83xx_phylink_mac_config(struct dsa_switch *ds, int port,
 	reg = sw_r32(priv->r->mac_force_mode_ctrl(port));
 	/* Auto-Negotiation does not work for MAC in RTL8390 */
 	if (priv->family_id == RTL8380_FAMILY_ID) {
 -		if (mode == MLO_AN_PHY) {
 +		if (mode == MLO_AN_PHY || phylink_autoneg_inband(mode)) {
 			pr_debug("PHY autonegotiates\n");
 			reg |= BIT(2);
 			sw_w32(reg, priv->r->mac_force_mode_ctrl(port));
 +			rtl83xx_config_interface(port, state->interface);
 			return;
 		}
 	}
@@ -509,8 +543,11 @@ static int rtl83xx_port_enable(struct dsa_switch *ds, int port,
 	v |= priv->ports[port].pm;
 	priv->r->traffic_set(port, v);
@@ -1129,7 +1280,7 @@ index 987b47dc8f..721b1817a5 100644
 	return 0;
 }
-@@ -577,58 +574,55 @@ static void rtl83xx_port_disable(struct dsa_switch *ds, int port)
+@@ -537,58 +574,55 @@ static void rtl83xx_port_disable(struct dsa_switch *ds, int port)
 	priv->ports[port].enable = false;
 }
@@ -1218,7 +1369,7 @@ index 987b47dc8f..721b1817a5 100644
 	return 0;
 }
-@@ -658,7 +652,7 @@ static int rtl83xx_port_bridge_join(struct dsa_switch *ds, int port,
+@@ -618,7 +652,7 @@ static int rtl83xx_port_bridge_join(struct dsa_switch *ds, int port,
 					struct net_device *bridge)
 {
 	struct rtl838x_switch_priv *priv = ds->priv;
@@ -1227,7 +1378,7 @@ index 987b47dc8f..721b1817a5 100644
 	int i;
 	pr_debug("%s %x: %d %llx", __func__, (u32)priv, port, port_bitmap);
-@@ -674,8 +668,8 @@ static int rtl83xx_port_bridge_join(struct dsa_switch *ds, int port,
+@@ -634,8 +668,8 @@ static int rtl83xx_port_bridge_join(struct dsa_switch *ds, int port,
 			if (priv->ports[i].enable)
 				priv->r->traffic_enable(i, port);
@@ -1238,7 +1389,7 @@ index 987b47dc8f..721b1817a5 100644
 		}
 	}
-@@ -696,7 +690,7 @@ static void rtl83xx_port_bridge_leave(struct dsa_switch *ds, int port,
+@@ -656,7 +690,7 @@ static void rtl83xx_port_bridge_leave(struct dsa_switch *ds, int port,
 					struct net_device *bridge)
 {
 	struct rtl838x_switch_priv *priv = ds->priv;
@@ -1247,7 +1398,7 @@ index 987b47dc8f..721b1817a5 100644
 	int i;
 	pr_debug("%s %x: %d", __func__, (u32)priv, port);
-@@ -714,7 +708,7 @@ static void rtl83xx_port_bridge_leave(struct dsa_switch *ds, int port,
+@@ -674,7 +708,7 @@ static void rtl83xx_port_bridge_leave(struct dsa_switch *ds, int port,
 			if (priv->ports[i].enable)
 				priv->r->traffic_disable(i, port);
@@ -1256,7 +1407,7 @@ index 987b47dc8f..721b1817a5 100644
 			port_bitmap &= ~BIT_ULL(i);
 		}
 	}
-@@ -866,17 +860,16 @@ static int rtl83xx_vlan_prepare(struct dsa_switch *ds, int port,
+@@ -826,17 +860,16 @@ static int rtl83xx_vlan_prepare(struct dsa_switch *ds, int port,
 	struct rtl838x_vlan_info info;
 	struct rtl838x_switch_priv *priv = ds->priv;
@@ -1279,7 +1430,7 @@ index 987b47dc8f..721b1817a5 100644
 	priv->r->vlan_set_untagged(1, info.untagged_ports);
 	pr_debug("SET: Untagged ports, VLAN %d: %llx\n", 1, info.untagged_ports);
-@@ -894,7 +887,7 @@ static void rtl83xx_vlan_add(struct dsa_switch *ds, int port,
+@@ -854,7 +887,7 @@ static void rtl83xx_vlan_add(struct dsa_switch *ds, int port,
 	struct rtl838x_switch_priv *priv = ds->priv;
 	int v;
@@ -1288,7 +1439,7 @@ index 987b47dc8f..721b1817a5 100644
 		port, vlan->vid_begin, vlan->vid_end, vlan->flags);
 	if (vlan->vid_begin > 4095 || vlan->vid_end > 4095) {
-@@ -939,10 +932,10 @@ static void rtl83xx_vlan_add(struct dsa_switch *ds, int port,
+@@ -899,10 +932,10 @@ static void rtl83xx_vlan_add(struct dsa_switch *ds, int port,
 			info.untagged_ports |= BIT_ULL(port);
 		priv->r->vlan_set_untagged(v, info.untagged_ports);
@@ -1301,7 +1452,7 @@ index 987b47dc8f..721b1817a5 100644
 	}
 	mutex_unlock(&priv->reg_mutex);
-@@ -993,59 +986,136 @@ static int rtl83xx_vlan_del(struct dsa_switch *ds, int port,
+@@ -953,59 +986,136 @@ static int rtl83xx_vlan_del(struct dsa_switch *ds, int port,
 	return 0;
 }
@@ -1472,7 +1623,7 @@ index 987b47dc8f..721b1817a5 100644
 	err = -ENOTSUPP;
 out:
 	mutex_unlock(&priv->reg_mutex);
-@@ -1057,41 +1127,29 @@ static int rtl83xx_port_fdb_del(struct dsa_switch *ds, int port,
+@@ -1017,41 +1127,29 @@ static int rtl83xx_port_fdb_del(struct dsa_switch *ds, int port,
 {
 	struct rtl838x_switch_priv *priv = ds->priv;
 	u64 mac = ether_addr_to_u64(addr);
@@ -1527,7 +1678,7 @@ index 987b47dc8f..721b1817a5 100644
 		goto out;
 	}
 	err = -ENOENT;
-@@ -1106,8 +1164,7 @@ static int rtl83xx_port_fdb_dump(struct dsa_switch *ds, int port,
+@@ -1066,8 +1164,7 @@ static int rtl83xx_port_fdb_dump(struct dsa_switch *ds, int port,
 	struct rtl838x_l2_entry e;
 	struct rtl838x_switch_priv *priv = ds->priv;
 	int i;
@@ -1537,7 +1688,7 @@ index 987b47dc8f..721b1817a5 100644
 	u64 mac;
 	mutex_lock(&priv->reg_mutex);
-@@ -1119,13 +1176,25 @@ static int rtl83xx_port_fdb_dump(struct dsa_switch *ds, int port,
+@@ -1079,13 +1176,25 @@ static int rtl83xx_port_fdb_dump(struct dsa_switch *ds, int port,
 			continue;
 		if (e.port == port) {
@@ -1566,7 +1717,7 @@ index 987b47dc8f..721b1817a5 100644
 	}
 	for (i = 0; i < 64; i++) {
-@@ -1142,6 +1211,164 @@ static int rtl83xx_port_fdb_dump(struct dsa_switch *ds, int port,
+@@ -1102,6 +1211,164 @@ static int rtl83xx_port_fdb_dump(struct dsa_switch *ds, int port,
 	return 0;
 }
@@ -1731,7 +1882,7 @@ index 987b47dc8f..721b1817a5 100644
 static int rtl83xx_port_mirror_add(struct dsa_switch *ds, int port,
 				   struct dsa_mall_mirror_tc_entry *mirror,
 				   bool ingress)
-@@ -1308,6 +1535,10 @@ const struct dsa_switch_ops rtl83xx_switch_ops = {
+@@ -1268,6 +1535,10 @@ const struct dsa_switch_ops rtl83xx_switch_ops = {
 	.port_fdb_del		= rtl83xx_port_fdb_del,
 	.port_fdb_dump		= rtl83xx_port_fdb_dump,
@@ -1742,7 +1893,7 @@ index 987b47dc8f..721b1817a5 100644
 	.port_mirror_add	= rtl83xx_port_mirror_add,
 	.port_mirror_del	= rtl83xx_port_mirror_del,
 };
-@@ -1332,6 +1563,9 @@ const struct dsa_switch_ops rtl930x_switch_ops = {
+@@ -1292,6 +1563,9 @@ const struct dsa_switch_ops rtl930x_switch_ops = {
 	.port_enable		= rtl83xx_port_enable,
 	.port_disable		= rtl83xx_port_disable,
@@ -1752,7 +1903,7 @@ index 987b47dc8f..721b1817a5 100644
 	.set_ageing_time	= rtl83xx_set_l2aging,
 	.port_bridge_join	= rtl83xx_port_bridge_join,
 	.port_bridge_leave	= rtl83xx_port_bridge_leave,
-@@ -1346,4 +1580,9 @@ const struct dsa_switch_ops rtl930x_switch_ops = {
+@@ -1306,4 +1580,9 @@ const struct dsa_switch_ops rtl930x_switch_ops = {
 	.port_fdb_add		= rtl83xx_port_fdb_add,
 	.port_fdb_del		= rtl83xx_port_fdb_del,
 	.port_fdb_dump		= rtl83xx_port_fdb_dump,
@@ -4018,7 +4169,7 @@ index a33941a0eb..f98bf7df29 100644
 {
 	volatile u64 *ptr = RTL838X_SW_BASE + RTL839X_PORT_ISO_CTRL(0);
 diff --git a/target/linux/realtek/files-5.4/drivers/net/ethernet/rtl838x_eth.c b/target/linux/realtek/files-5.4/drivers/net/ethernet/rtl838x_eth.c
-index 2f678b7384..c5c6e3b6b7 100644
+index 7931daff07..c5c6e3b6b7 100644
 --- a/target/linux/realtek/files-5.4/drivers/net/ethernet/rtl838x_eth.c
 +++ b/target/linux/realtek/files-5.4/drivers/net/ethernet/rtl838x_eth.c
@@ -234,19 +234,21 @@ struct dsa_tag {
@@ -4139,6 +4290,15 @@ index 2f678b7384..c5c6e3b6b7 100644
 	sw_w32_mask(0, BIT(priv->cpu_port), RTL930X_L2_UNKN_UC_FLD_PMSK);
 	sw_w32(0x217, priv->r->mac_force_mode_ctrl + priv->cpu_port * 4);
@@ -855,7 +869,7 @@ static int rtl838x_eth_open(struct net_device *ndev)
 	struct ring_b *ring = priv->membase;
 	int i, err;
 -	pr_info("%s called: RX rings %d(length %d), TX rings %d(length %d)\n",
 +	pr_debug("%s called: RX rings %d(length %d), TX rings %d(length %d)\n",
 		__func__, priv->rxrings, priv->rxringlen, TXRINGS, TXRINGLEN);
 	spin_lock_irqsave(&priv->lock, flags);
@@ -883,28 +897,30 @@ static int rtl838x_eth_open(struct net_device *ndev)
 	switch (priv->family_id) {
 	case RTL8380_FAMILY_ID:
@@ -4213,6 +4373,123 @@ index 2f678b7384..c5c6e3b6b7 100644
 			dev->stats.rx_packets++;
 			dev->stats.rx_bytes += len;
@@ -1342,7 +1369,7 @@ static void rtl838x_validate(struct phylink_config *config,
 {
 	__ETHTOOL_DECLARE_LINK_MODE_MASK(mask) = { 0, };
 -	pr_info("In %s\n", __func__);
 +	pr_debug("In %s\n", __func__);
 	if (!phy_interface_mode_is_rgmii(state->interface) &&
 	    state->interface != PHY_INTERFACE_MODE_1000BASEX &&
@@ -1404,7 +1431,7 @@ static void rtl838x_mac_an_restart(struct phylink_config *config)
 	if (priv->family_id != RTL8380_FAMILY_ID)
 		return;
 -	pr_info("In %s\n", __func__);
 +	pr_debug("In %s\n", __func__);
 	/* Restart by disabling and re-enabling link */
 	sw_w32(0x6192D, priv->r->mac_force_mode_ctrl + priv->cpu_port * 4);
 	mdelay(20);
@@ -1419,7 +1446,7 @@ static int rtl838x_mac_pcs_get_state(struct phylink_config *config,
 	struct rtl838x_eth_priv *priv = netdev_priv(dev);
 	int port = priv->cpu_port;
 -	pr_info("In %s\n", __func__);
 +	pr_debug("In %s\n", __func__);
 	state->link = priv->r->get_mac_link_sts(port) ? 1 : 0;
 	state->duplex = priv->r->get_mac_link_dup_sts(port) ? 1 : 0;
@@ -1456,7 +1483,7 @@ static void rtl838x_mac_link_down(struct phylink_config *config,
 	struct net_device *dev = container_of(config->dev, struct net_device, dev);
 	struct rtl838x_eth_priv *priv = netdev_priv(dev);
 -	pr_info("In %s\n", __func__);
 +	pr_debug("In %s\n", __func__);
 	/* Stop TX/RX to port */
 	sw_w32_mask(0x03, 0, priv->r->mac_port_ctrl(priv->cpu_port));
 }
@@ -1468,7 +1495,7 @@ static void rtl838x_mac_link_up(struct phylink_config *config, unsigned int mode
 	struct net_device *dev = container_of(config->dev, struct net_device, dev);
 	struct rtl838x_eth_priv *priv = netdev_priv(dev);
 -	pr_info("In %s\n", __func__);
 +	pr_debug("In %s\n", __func__);
 	/* Restart TX/RX to port */
 	sw_w32_mask(0, 0x03, priv->r->mac_port_ctrl(priv->cpu_port));
 }
@@ -1479,7 +1506,7 @@ static void rtl838x_set_mac_hw(struct net_device *dev, u8 *mac)
 	unsigned long flags;
 	spin_lock_irqsave(&priv->lock, flags);
 -	pr_info("In %s\n", __func__);
 +	pr_debug("In %s\n", __func__);
 	sw_w32((mac[0] << 8) | mac[1], priv->r->mac);
 	sw_w32((mac[2] << 24) | (mac[3] << 16) | (mac[4] << 8) | mac[5], priv->r->mac + 4);
@@ -1547,7 +1574,7 @@ static int rtl838x_get_link_ksettings(struct net_device *ndev,
 {
 	struct rtl838x_eth_priv *priv = netdev_priv(ndev);
 -	pr_info("%s called\n", __func__);
 +	pr_debug("%s called\n", __func__);
 	return phylink_ethtool_ksettings_get(priv->phylink, cmd);
 }
@@ -1556,7 +1583,7 @@ static int rtl838x_set_link_ksettings(struct net_device *ndev,
 {
 	struct rtl838x_eth_priv *priv = netdev_priv(ndev);
 -	pr_info("%s called\n", __func__);
 +	pr_debug("%s called\n", __func__);
 	return phylink_ethtool_ksettings_set(priv->phylink, cmd);
 }
@@ -1678,7 +1705,7 @@ static int rtl931x_mdio_write(struct mii_bus *bus, int mii_id,
 static int rtl838x_mdio_reset(struct mii_bus *bus)
 {
 -	pr_info("%s called\n", __func__);
 +	pr_debug("%s called\n", __func__);
 	/* Disable MAC polling the PHY so that we can start configuration */
 	sw_w32(0x00000000, RTL838X_SMI_POLL_CTRL);
@@ -1693,7 +1720,7 @@ static int rtl839x_mdio_reset(struct mii_bus *bus)
 {
 	return 0;
 -	pr_info("%s called\n", __func__);
 +	pr_debug("%s called\n", __func__);
 	/* BUG: The following does not work, but should! */
 	/* Disable MAC polling the PHY so that we can start configuration */
 	sw_w32(0x00000000, RTL839X_SMI_PORT_POLLING_CTRL);
@@ -1710,7 +1737,7 @@ static int rtl931x_mdio_reset(struct mii_bus *bus)
 	sw_w32(0x00000000, RTL931X_SMI_PORT_POLLING_CTRL);
 	sw_w32(0x00000000, RTL931X_SMI_PORT_POLLING_CTRL + 4);
 -	pr_info("%s called\n", __func__);
 +	pr_debug("%s called\n", __func__);
 	return 0;
 }
@@ -1767,7 +1794,7 @@ static int rtl838x_mdio_init(struct rtl838x_eth_priv *priv)
 	struct device_node *mii_np;
 	int ret;
 -	pr_info("%s called\n", __func__);
 +	pr_debug("%s called\n", __func__);
 	mii_np = of_get_child_by_name(priv->pdev->dev.of_node, "mdio-bus");
 	if (!mii_np) {
@@ -1827,7 +1854,7 @@ err_put_node:
 static int rtl838x_mdio_remove(struct rtl838x_eth_priv *priv)
 {
 -	pr_info("%s called\n", __func__);
 +	pr_debug("%s called\n", __func__);
 	if (!priv->mii_bus)
 		return 0;
@@ -1837,6 +1864,40 @@ static int rtl838x_mdio_remove(struct rtl838x_eth_priv *priv)
 	return 0;
 }
@@ -5126,10 +5403,10 @@ index 78953c6d17..cfddb0aced 100644
 	{
 		PHY_ID_MATCH_MODEL(PHY_ID_RTL8218B_I),
 diff --git a/target/linux/realtek/image/Makefile b/target/linux/realtek/image/Makefile
-index 18e5fedb9b..b142c3d16b 100644
+index 424726c8a9..a4b2ea892c 100644
 --- a/target/linux/realtek/image/Makefile
 +++ b/target/linux/realtek/image/Makefile
-@@ -127,4 +127,13 @@ define Device/zyxel_gs1900-8hp-v2
+@@ -118,4 +118,13 @@ define Device/zyxel_gs1900-8hp-v2
 endef
 TARGET_DEVICES += zyxel_gs1900-8hp-v2
--- a/backports/0009-include-set-kernel-version.mk.patch
+++ b/backports/0009-include-set-kernel-version.mk.patch
@@ -1,7 +1,7 @@
-From 1380e4f25375a9246c3a7a3b2bdc33ffdc38b3c5 Mon Sep 17 00:00:00 2001
+From 3b896a540de03ca8dfd5596881f9ec6dc15d72c9 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Wed, 7 Apr 2021 10:46:26 +0200
-Subject: [PATCH] include: set kernel-version.mk
+Subject: [PATCH 01/32] 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 8531c0c3d1..1f619b86c0 100644
+index 52e5c11d75..547f57fa11 100644
 --- a/include/kernel-version.mk
 +++ b/include/kernel-version.mk
@@ -6,9 +6,15 @@ ifdef CONFIG_TESTING_KERNEL
@@ -18,12 +18,12 @@ index 8531c0c3d1..1f619b86c0 100644
 +LINUX_VERSION-4.4 = .60
 +LINUX_VERSION-4.14 = .193
- LINUX_VERSION-5.4 = .137
+ LINUX_VERSION-5.4 = .111
 +LINUX_VERSION-5.10 = .27
 +LINUX_KERNEL_HASH-4.4.60 = 2cd8df6f1ac6a5329c5a286ec9b5956215977221a1b731597ed169fff74a9659
 +LINUX_KERNEL_HASH-4.14.193 = 0b0fb41d4430e1a42738b341cbfd2f41951aa5cd02acabbd53f076119c8b9f03
- LINUX_KERNEL_HASH-5.4.137 = f09e5e366ce5d8bde887cda229ef17138fd1653706a702221f934f99aaa31f7c
+ LINUX_KERNEL_HASH-5.4.111 = 21626132658dc34cb41b7aa7b80ecf83751890a71ac1a63d77aea9d488271a03
 +LINUX_KERNEL_HASH-5.10.27 = d99dc9662951299c53a0a8d8c8d0a72a16ff861d20e927c0f9b14f63282d69d9
 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
--- a/backports/0013-iw-update-to-latest-HEAD.patch
+++ b/backports/0013-iw-update-to-latest-HEAD.patch
@@ -0,0 +1,167 @@
 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/0014-libubox-update-to-latest-HEAD.patch
+++ b/backports/0014-libubox-update-to-latest-HEAD.patch
@@ -0,0 +1,32 @@
 From 5171503cfa4387370fd4c33bbcf0d8c4b6ec86e4 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Tue, 18 May 2021 10:46:43 +0200
 Subject: [PATCH] libubox: update to latest HEAD
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
 package/libs/libubox/Makefile                 |   4 +-
 package/network/config/netifd/Makefile        |   4 +-
 .../config/netifd/patches/100-8021x.patch     | 421 ++++++++++++++++++
 3 files changed, 425 insertions(+), 4 deletions(-)
 create mode 100644 package/network/config/netifd/patches/100-8021x.patch
 diff --git a/package/libs/libubox/Makefile b/package/libs/libubox/Makefile
 index 4d582eacfd..8644764d59 100644
 --- a/package/libs/libubox/Makefile
 +++ b/package/libs/libubox/Makefile
@@ -5,9 +5,9 @@ PKG_RELEASE=1
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/libubox.git
 -PKG_MIRROR_HASH:=97dc4eba01cf2c5d6a6d0db3747e0cdc0d95cb87e51b3115272e7d3e69a8b255
 +#PKG_MIRROR_HASH:=97dc4eba01cf2c5d6a6d0db3747e0cdc0d95cb87e51b3115272e7d3e69a8b255
 PKG_SOURCE_DATE:=2020-12-12
 -PKG_SOURCE_VERSION:=357877693ca363b12e6e7e14d345639b2440cd07
 +PKG_SOURCE_VERSION:=b14c4688612c05c78ce984d7bde633bce8703b1e
 PKG_ABI_VERSION:=$(call abi_version_str,$(PKG_SOURCE_DATE))
 CMAKE_INSTALL:=1
 -- 
 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
@@ -0,0 +1,45 @@
 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/0036-iwinfo-update-to-latest-git-HEAD.patch
+++ b/backports/0036-iwinfo-update-to-latest-git-HEAD.patch
@@ -0,0 +1,39 @@
 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/0037-netifd-update-to-latest-HEAD.patch
+++ b/backports/0037-netifd-update-to-latest-HEAD.patch
@@ -1,32 +1,75 @@
-From 27b9d1d180ac64ed4c25a5bf11c40c995be7b897 Mon Sep 17 00:00:00 2001
+From ddaf9ee904b614f79c87f6d67d6c7b09c5d46eca Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Thu, 27 May 2021 13:24:47 +0200
-Subject: [PATCH] netifd: update to latest HEAD
+Subject: [PATCH 01/44] netifd: update to latest HEAD
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
- package/network/config/netifd/Makefile          |  6 +++---
+ package/network/config/netifd/Makefile          | 12 +++++++++---
 .../network/config/netifd/files/etc/udhcpc.user |  1 +
 .../config/netifd/files/lib/netifd/dhcp.script  |  3 +++
 .../netifd/patches/002-fix-dhcp-issue.patch     | 17 +++++++++++++++++
- 2 files changed, 20 insertions(+), 3 deletions(-)
+ 4 files changed, 30 insertions(+), 3 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 4b5f110da2..32ed4edb42 100644
+index 7061456b08..5717a400be 100644
 --- a/package/network/config/netifd/Makefile
 +++ b/package/network/config/netifd/Makefile
@@ -5,9 +5,9 @@ PKG_RELEASE:=1
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/netifd.git
-PKG_SOURCE_DATE:=2021-07-26
+-PKG_SOURCE_DATE:=2021-01-09
-PKG_SOURCE_VERSION:=440eb0647708274cc8d7d9e7c2bb0cfdfba90023
+-PKG_SOURCE_VERSION:=c00c8335d6188daa326ecfe5a62da15a9b9987e1
-PKG_MIRROR_HASH:=eed957036ab608fdc49bdf801fc5b4405fcd2a3a5e5d3343ec39898e156c10e9
+-PKG_MIRROR_HASH:=c740e51e0cec13eec336ba1c7a643db3b64a9a2235f8c1b73a566cb89e841190
 +PKG_SOURCE_DATE:=2021-05-26
 +PKG_SOURCE_VERSION:=1eb0fafaa9865b729509a7d47ecf1f05c2c0595c
 +PKG_MIRROR_HASH:=81ff2a20225b41e197fd2dcb86068459d868cbc8b23700c8f011806452d553e8
 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 PKG_LICENSE:=GPL-2.0
@@ -25,6 +25,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 +45,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/0038-mac80211-update-to-latest-HEAD.patch
+++ b/backports/0038-mac80211-update-to-latest-HEAD.patch
--- a/backports/0039-hostapd-upsate-to-latest-HEAD.patch
+++ b/backports/0039-hostapd-upsate-to-latest-HEAD.patch
@@ -1,16 +1,16 @@
-From 57ab692abddc107e1a6bffed52fcb46eb4e49f66 Mon Sep 17 00:00:00 2001
+From 84b526991e77774e21c3eb1a193ca3087b624e83 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
-Date: Tue, 10 Aug 2021 07:52:08 +0200
+Date: Thu, 27 May 2021 13:25:19 +0200
-Subject: [PATCH] hostapd: update to latest HEAD
+Subject: [PATCH 01/41] hostapd: upsate 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 | 139 +++++++--
+ .../network/services/hostapd/files/hostapd.sh | 156 ++++++++--
 ...-fix-frequency-setup-with-HE-enabled.patch | 196 -------------
- ...> 001-wolfssl-init-RNG-with-ECC-key.patch} |  11 +-
+ .../001-wolfssl-init-RNG-with-ECC-key.patch   |  43 +++
 ...-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        | 217 +++++++++++++-
 .../services/hostapd/src/src/ap/ubus.h        |  16 +
 .../hostapd/src/src/utils/build_features.h    |   2 -
- 67 files changed, 1250 insertions(+), 2333 deletions(-)
+ 67 files changed, 1302 insertions(+), 2330 deletions(-)
 delete mode 100644 package/network/services/hostapd/patches/001-HE-VHT-fix-frequency-setup-with-HE-enabled.patch
- rename package/network/services/hostapd/patches/{802-wolfssl-init-RNG-with-ECC-key.patch => 001-wolfssl-init-RNG-with-ECC-key.patch} (76%)
+ create mode 100644 package/network/services/hostapd/patches/001-wolfssl-init-RNG-with-ECC-key.patch
 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 67ea89c339..fee6889b40 100644
+index bd2a7c96ad..fee6889b40 100644
 --- a/package/network/services/hostapd/Makefile
 +++ b/package/network/services/hostapd/Makefile
@@ -1,19 +1,17 @@
@@ -126,7 +126,7 @@ index 67ea89c339..fee6889b40 100644
 include $(TOPDIR)/rules.mk
 PKG_NAME:=hostapd
-PKG_RELEASE:=35
+-PKG_RELEASE:=32
 +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 aa72e09eba..4591958b6f 100644
+index 45a49b8faa..4591958b6f 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,15 +190,17 @@ index aa72e09eba..4591958b6f 100644
 		;;
 		eap-eap192)
 			append wpa_key_mgmt "WPA-EAP-SUITE-B-192"
-@@ -91,6 +92,7 @@ hostapd_add_log_config() {
+@@ -91,14 +92,19 @@ 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 country3
+-	config_add_string country
 +	config_add_string country country3
 	config_add_boolean country_ie doth
-@@ -99,6 +101,10 @@ hostapd_common_add_device_config() {
+ 	config_add_boolean spectrum_mgmt_required
 	config_add_int local_pwr_constraint
 	config_add_string require_mode
 	config_add_boolean legacy_rates
 	config_add_int cell_density
@@ -209,17 +211,27 @@ index aa72e09eba..4591958b6f 100644
 	config_add_string acs_chan_bias
 	config_add_array hostapd_options
-@@ -115,7 +121,8 @@ hostapd_prepare_device_config() {
+@@ -114,8 +120,9 @@ hostapd_prepare_device_config() {
 	local base_cfg=
- 	json_get_vars country country3 country_ie beacon_int:100 dtim_period:2 doth require_mode legacy_rates \
+-	json_get_vars country 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
-@@ -207,11 +214,16 @@ hostapd_prepare_device_config() {
+@@ -128,6 +135,7 @@ 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
@@ -236,7 +248,16 @@ index aa72e09eba..4591958b6f 100644
 	json_get_values opts hostapd_options
 	for val in $opts; do
-@@ -269,7 +281,7 @@ hostapd_common_add_bss_config() {
+@@ -251,6 +264,8 @@ 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
@@ -245,15 +266,19 @@ index aa72e09eba..4591958b6f 100644
 	config_add_string vlan_tagged_interface vlan_bridge
 	config_add_string vlan_file
-@@ -287,6 +299,7 @@ hostapd_common_add_bss_config() {
+@@ -281,9 +296,10 @@ hostapd_common_add_bss_config() {
- 	config_add_boolean wnm_sleep_mode wnm_sleep_mode_no_keys bss_transition
+ 	config_add_string wps_device_type wps_device_name wps_manufacturer wps_pin
 	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
-@@ -311,6 +324,7 @@ hostapd_common_add_bss_config() {
+@@ -308,6 +324,7 @@ hostapd_common_add_bss_config() {
 	config_add_array supported_rates
 	config_add_boolean sae_require_mfp
@@ -261,7 +286,7 @@ index aa72e09eba..4591958b6f 100644
 	config_add_string 'owe_transition_bssid:macaddr' 'owe_transition_ssid:string'
-@@ -319,7 +333,7 @@ hostapd_common_add_bss_config() {
+@@ -316,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
@@ -270,7 +295,7 @@ index aa72e09eba..4591958b6f 100644
 	config_add_boolean hs20 disable_dgaf osen
 	config_add_int anqp_domain_id
-@@ -330,12 +344,22 @@ hostapd_common_add_bss_config() {
+@@ -327,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
@@ -294,7 +319,7 @@ index aa72e09eba..4591958b6f 100644
 }
 hostapd_set_vlan_file() {
-@@ -387,7 +411,7 @@ append_iw_anqp_3gpp_cell_net() {
+@@ -384,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
@@ -303,7 +328,7 @@ index aa72e09eba..4591958b6f 100644
 	fi
 }
-@@ -399,10 +423,22 @@ append_iw_nai_realm() {
+@@ -396,10 +423,22 @@ append_iw_nai_realm() {
 	[ -n "$1" ] && append bss_conf "nai_realm=$1" "$N"
 }
@@ -326,7 +351,7 @@ index aa72e09eba..4591958b6f 100644
 append_osu_provider_service_desc() {
 	append bss_conf "osu_service_desc=$1" "$N"
 }
-@@ -450,6 +486,7 @@ append_osu_provider() {
+@@ -447,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
@@ -334,7 +359,7 @@ index aa72e09eba..4591958b6f 100644
 	config_list_foreach "$1" osu_icon append_osu_icon
 	append bss_conf "$N"
-@@ -459,6 +496,14 @@ append_hs20_conn_capab() {
+@@ -456,6 +496,14 @@ append_hs20_conn_capab() {
 	[ -n "$1" ] && append bss_conf "hs20_conn_capab=$1" "$N"
 }
@@ -349,7 +374,7 @@ index aa72e09eba..4591958b6f 100644
 append_airtime_sta_weight() {
 	[ -n "$1" ] && append bss_conf "airtime_sta_weight=$1" "$N"
 }
-@@ -482,10 +527,12 @@ hostapd_set_bss_options() {
+@@ -479,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 \
@@ -364,7 +389,7 @@ index aa72e09eba..4591958b6f 100644
 	set_default isolate 0
 	set_default maxassoc 0
-@@ -506,6 +553,7 @@ hostapd_set_bss_options() {
+@@ -503,6 +553,7 @@ hostapd_set_bss_options() {
 	set_default multi_ap 0
 	set_default airtime_bss_weight 0
 	set_default airtime_bss_limit 0
@@ -372,7 +397,7 @@ index aa72e09eba..4591958b6f 100644
 	append bss_conf "ctrl_interface=/var/run/hostapd"
 	if [ "$isolate" -gt 0 ]; then
-@@ -532,6 +580,7 @@ hostapd_set_bss_options() {
+@@ -529,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"
@@ -380,7 +405,7 @@ index aa72e09eba..4591958b6f 100644
 	[ "$tdls_prohibit" -gt 0 ] && append bss_conf "tdls_prohibit=$tdls_prohibit" "$N"
-@@ -550,6 +599,7 @@ hostapd_set_bss_options() {
+@@ -547,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"
@@ -388,7 +413,7 @@ index aa72e09eba..4591958b6f 100644
 	}
 	case "$auth_type" in
-@@ -563,6 +613,7 @@ hostapd_set_bss_options() {
+@@ -560,6 +613,7 @@ hostapd_set_bss_options() {
 		;;
 	esac
 	[ -n "$sae_require_mfp" ] && append bss_conf "sae_require_mfp=$sae_require_mfp" "$N"
@@ -396,7 +421,7 @@ index aa72e09eba..4591958b6f 100644
 	local vlan_possible=""
-@@ -604,7 +655,7 @@ hostapd_set_bss_options() {
+@@ -601,7 +655,7 @@ hostapd_set_bss_options() {
 				auth_server auth_secret auth_port \
 				dae_client dae_secret dae_port \
 				ownip radius_client_addr \
@@ -405,7 +430,7 @@ index aa72e09eba..4591958b6f 100644
 			# radius can provide VLAN ID for clients
 			vlan_possible=1
-@@ -616,18 +667,22 @@ hostapd_set_bss_options() {
+@@ -613,18 +667,22 @@ hostapd_set_bss_options() {
 			set_default auth_port 1812
 			set_default dae_port 3799
@@ -432,7 +457,7 @@ index aa72e09eba..4591958b6f 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"
-@@ -700,6 +755,7 @@ hostapd_set_bss_options() {
+@@ -697,19 +755,24 @@ hostapd_set_bss_options() {
 	append bss_conf "ssid=$ssid" "$N"
 	[ -n "$network_bridge" ] && append bss_conf "bridge=$network_bridge" "$N"
@@ -440,7 +465,26 @@ index aa72e09eba..4591958b6f 100644
 	[ -n "$iapp_interface" ] && {
 		local ifname
 		network_get_device ifname "$iapp_interface" || ifname="$iapp_interface"
-@@ -740,7 +796,7 @@ hostapd_set_bss_options() {
+ 		append bss_conf "iapp_interface=$ifname" "$N"
 	}
 -	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"
@@ -449,7 +493,7 @@ index aa72e09eba..4591958b6f 100644
 		}
 	fi
-@@ -764,6 +820,7 @@ hostapd_set_bss_options() {
+@@ -757,6 +820,7 @@ hostapd_set_bss_options() {
 				;;
 			esac
@@ -457,7 +501,7 @@ index aa72e09eba..4591958b6f 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"
-@@ -778,6 +835,13 @@ hostapd_set_bss_options() {
+@@ -771,6 +835,13 @@ hostapd_set_bss_options() {
 				set_default r0_key_lifetime 10000
 				set_default pmk_r1_push 0
@@ -471,7 +515,7 @@ index aa72e09eba..4591958b6f 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"
-@@ -863,13 +927,17 @@ hostapd_set_bss_options() {
+@@ -856,13 +927,17 @@ hostapd_set_bss_options() {
 	}
 	[ -n "$vlan_possible" -a -n "$dynamic_vlan" ] && {
@@ -491,7 +535,7 @@ index aa72e09eba..4591958b6f 100644
 		[ -n "$vlan_tagged_interface" ] && \
 			append bss_conf "vlan_tagged_interface=$vlan_tagged_interface" "$N"
 		[ -n "$vlan_file" ] && {
-@@ -882,6 +950,7 @@ hostapd_set_bss_options() {
+@@ -875,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
@@ -499,7 +543,7 @@ index aa72e09eba..4591958b6f 100644
 	set_default iw_enabled 0
 	if [ "$iw_enabled" = "1" ]; then
-@@ -910,6 +979,8 @@ hostapd_set_bss_options() {
+@@ -903,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
@@ -508,7 +552,7 @@ index aa72e09eba..4591958b6f 100644
 		iw_domain_name_conf=
 		json_for_each_item append_iw_domain_name iw_domain_name
-@@ -924,9 +995,11 @@ hostapd_set_bss_options() {
+@@ -917,9 +995,11 @@ hostapd_set_bss_options() {
 	local hs20 disable_dgaf osen anqp_domain_id hs20_deauth_req_timeout \
@@ -522,7 +566,7 @@ index aa72e09eba..4591958b6f 100644
 	set_default hs20 0
 	set_default disable_dgaf $hs20
-@@ -945,16 +1018,31 @@ hostapd_set_bss_options() {
+@@ -938,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"
@@ -555,7 +599,7 @@ index aa72e09eba..4591958b6f 100644
 	set_default per_sta_vif 0
 	if [ "$per_sta_vif" -gt 0 ]; then
-@@ -1086,9 +1174,9 @@ wpa_supplicant_set_fixed_freq() {
+@@ -1079,9 +1174,9 @@ wpa_supplicant_set_fixed_freq() {
 		VHT*) append network_data "vht=1" "$N$T";;
 	esac
 	case "$htmode" in
@@ -568,7 +612,7 @@ index aa72e09eba..4591958b6f 100644
 		*) append network_data "disable_vht=1" "$N$T";;
 	esac
 }
-@@ -1106,7 +1194,8 @@ wpa_supplicant_add_network() {
+@@ -1099,7 +1194,8 @@ wpa_supplicant_add_network() {
 		ssid bssid key \
 		basic_rate mcast_rate \
 		ieee80211w ieee80211r \
@@ -578,7 +622,7 @@ index aa72e09eba..4591958b6f 100644
 	case "$auth_type" in
 		sae|owe|eap192|eap-eap192)
-@@ -1119,6 +1208,7 @@ wpa_supplicant_add_network() {
+@@ -1112,6 +1208,7 @@ wpa_supplicant_add_network() {
 	set_default ieee80211r 0
 	set_default multi_ap 0
@@ -586,7 +630,7 @@ index aa72e09eba..4591958b6f 100644
 	local key_mgmt='NONE'
 	local network_data=
-@@ -1150,7 +1240,10 @@ wpa_supplicant_add_network() {
+@@ -1143,7 +1240,10 @@ wpa_supplicant_add_network() {
 		scan_ssid=""
 	}
@@ -800,51 +844,55 @@ index 37c17c50af..0000000000
 - 
 - 	if (ssid->mesh_basic_rates == NULL) {
 - 		/*
-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
+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
-similarity index 76%
+new file mode 100644
-rename from package/network/services/hostapd/patches/802-wolfssl-init-RNG-with-ECC-key.patch
+index 0000000000..84fc1c9351
-rename to package/network/services/hostapd/patches/001-wolfssl-init-RNG-with-ECC-key.patch
+--- /dev/null
 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
-@@ -14,11 +14,9 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
+@@ -0,0 +1,43 @@
-  src/crypto/crypto_wolfssl.c | 4 ++++
+From 21ce83b4ae2b9563175fdb4fc4312096cc399cf8 Mon Sep 17 00:00:00 2001
-  1 file changed, 4 insertions(+)
+From: David Bauer <mail@david-bauer.net>
- 
+Date: Wed, 5 May 2021 00:44:34 +0200
-diff --git a/src/crypto/crypto_wolfssl.c b/src/crypto/crypto_wolfssl.c
+Subject: [PATCH] wolfssl: add RNG to EC key
-index 2e4bf8962..ed2528159 100644
+
- --- a/src/crypto/crypto_wolfssl.c
+Since upstream commit 6467de5a8840 ("Randomize z ordinates in
- +++ b/src/crypto/crypto_wolfssl.c
+scalar mult when timing resistant") WolfSSL requires a RNG for
-@@ -1303,6 +1303,7 @@ int ecc_projective_add_point(ecc_point *P, ecc_point *Q, ecc_point *R,
+the EC key when built hardened which is the default.
 +
 +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;
-@@ -26,7 +24,7 @@ index 2e4bf8962..ed2528159 100644
++	WC_RNG rng;
-  	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 ||
-@@ -35,7 +33,7 @@ index 2e4bf8962..ed2528159 100644
++	    wc_InitRng(&e->rng) != 0 ||
-  	    wc_ecc_set_curve(&e->key, 0, curve_id) != 0 ||
++	    wc_ecc_set_rng(&e->key, &e->rng) != 0 ||
-  	    mp_init(&e->a) != MP_OKAY ||
+ 	    wc_ecc_set_curve(&e->key, 0, curve_id) != 0 ||
-  	    mp_init(&e->prime) != MP_OKAY ||
+ 	    mp_init(&e->a) != MP_OKAY ||
-@@ -1388,6 +1391,7 @@ void crypto_ec_deinit(struct crypto_ec* e)
+ 	    mp_init(&e->prime) != MP_OKAY ||
 +@@ -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);
-@@ -43,6 +41,3 @@ index 2e4bf8962..ed2528159 100644
++	wc_FreeRng(&e->rng);
-  	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/0040-mt76-update-to-latest-HEAD.patch
+++ b/backports/0040-mt76-update-to-latest-HEAD.patch
@@ -1,23 +1,24 @@
-From 4cfa1d85c713eba4dda69aca88613de9bf7fea84 Mon Sep 17 00:00:00 2001
+From e01de214b2492e1b8001d6057211017b5f0f6f49 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
-Date: Tue, 10 Aug 2021 07:53:35 +0200
+Date: Thu, 27 May 2021 13:25:41 +0200
-Subject: [PATCH] mt76: update to latest HEAD
+Subject: [PATCH 04/44] mt76: update to latest HEAD
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
- package/kernel/mt76/Makefile | 7 ++++---
+ package/kernel/mt76/Makefile | 11 ++++++-----
- 1 file changed, 4 insertions(+), 3 deletions(-)
+ 1 file changed, 6 insertions(+), 5 deletions(-)
 diff --git a/package/kernel/mt76/Makefile b/package/kernel/mt76/Makefile
-index e4051d8347..431c57a240 100644
+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-06-06
+-PKG_SOURCE_DATE:=2021-04-11
-PKG_SOURCE_VERSION:=22b690334c0f49b11534cc2e331c9d5e17c4a0bc
+-PKG_SOURCE_VERSION:=bf45b30d891961dd7c4139dddb58b909ea2c2b5a
-PKG_MIRROR_HASH:=ff5e563935919d2e40c1e7254ef3bc06f7ecc5e69f8ddd12903e8f5de942d630
+-PKG_MIRROR_HASH:=431cecf80dafa986e805f809522721c2bb26289867d6770695d49baf8b471bea
 +PKG_SOURCE_DATE:=2021-07-15
 +PKG_SOURCE_VERSION:=bbebea7d6dc64313132226adc3f7369d36e9359d
 +PKG_MIRROR_HASH:=17cd74e72c1f6c8742b698bf6772afacc6fba71b233af8c4d59530600cf44d5b
@@ -27,6 +28,24 @@ index e4051d8347..431c57a240 100644
 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,19 +1,20 @@
-From f5b3895aa93406e7d1e10ea20a1e73c9149b16d2 Mon Sep 17 00:00:00 2001
+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] ar71xx: hacks
+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 ++
- 2 files changed, 3 insertions(+), 1 deletion(-)
+ 3 files changed, 4 insertions(+), 1 deletion(-)
 diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk
-index b50ed06824..ac6d795e84 100644
+index 19b0d4696b..1b1c1e1a51 100644
 --- a/package/kernel/linux/modules/crypto.mk
 +++ b/package/kernel/linux/modules/crypto.mk
-@@ -890,7 +890,7 @@ define KernelPackage/crypto-sha256
+@@ -882,7 +882,7 @@ define KernelPackage/crypto-sha256
 	CONFIG_CRYPTO_SHA256_SSSE3
   FILES:= \
 	$(LINUX_DIR)/crypto/sha256_generic.ko \
@@ -22,6 +23,18 @@ index b50ed06824..ac6d795e84 100644
   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
--- a/config.yml
+++ b/config.yml
@@ -1,6 +1,6 @@
 repo:  https://github.com/openwrt/openwrt.git
 branch: openwrt-21.02
-revision: 94efa1c61247830b2e1190933e665eb3adcc66d5
+revision: 6fd65c657351908302b37447675ee352ec927d93
 output_dir: ./output
 patch_folders:
--- a/patches/0018-ramips-add-tplink-ex228-support.patch
+++ b/patches/0018-ramips-add-tplink-ex228-support.patch
@@ -1,4 +1,4 @@
-From 6eac1e5cb68149653b9e290aee34e3c5d596cecf Mon Sep 17 00:00:00 2001
+From 842b431559c3992e182190b7f96c4407978723c7 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
@@ -148,10 +148,10 @@ index 0000000000..9e5cc9ef01
 +	};
 +};
 diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk
-index a3bc14d59d..6e0b9b5f76 100644
+index a8f558326d..1a84abc842 100644
 --- a/target/linux/ramips/image/mt7621.mk
 +++ b/target/linux/ramips/image/mt7621.mk
-@@ -1271,6 +1271,16 @@ define Device/tplink_eap235-wall-v1
+@@ -1138,6 +1138,16 @@ define Device/tplink_eap235-wall-v1
 endef
 TARGET_DEVICES += tplink_eap235-wall-v1
@@ -169,11 +169,11 @@ index a3bc14d59d..6e0b9b5f76 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 4b44669b84..1c4e29dd97 100755
+index 89e679be7c..b6b8b6482d 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
-@@ -25,6 +25,7 @@ ramips_setup_interfaces()
+@@ -36,6 +36,7 @@ ramips_setup_interfaces()
- 	ampedwireless,ally-r1900k|\
+ 		;;
 	gehua,ghl-r-001|\
 	hiwifi,hc5962|\
 +	tplink,ex228|\
@@ -181,13 +181,13 @@ index 4b44669b84..1c4e29dd97 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 c2ad4d3ed6..acaa62d171 100755
+index c9152c5cf4..853a464ea5 100755
 --- a/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh
 +++ b/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh
-@@ -73,6 +73,7 @@ platform_do_upgrade() {
+@@ -61,6 +61,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/0021-ugps-update-to-latest-HEAD.patch
+++ b/patches/0021-ugps-update-to-latest-HEAD.patch
@@ -1,7 +1,7 @@
-From 3f95baef14fe74e5f447597b74932af9b184a421 Mon Sep 17 00:00:00 2001
+From efdbdcd3503315022a3270886826656be116345b Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
 Date: Sat, 19 Jun 2021 16:00:43 +0200
-Subject: [PATCH] ugps: update to latest HEAD
+Subject: [PATCH 38/38] 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 c70a7b7ea6..389138d1dd 100644
+index 4ce64d9631..e9a7f4fa8f 100644
 --- a/package/utils/ugps/Makefile
 +++ b/package/utils/ugps/Makefile
-@@ -12,9 +12,9 @@ PKG_RELEASE:=$(AUTORELEASE)
+@@ -12,9 +12,9 @@ PKG_RELEASE:=1
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/ugps.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_DATE:=2021-06-08
+-PKG_SOURCE_DATE:=2020-08-29
-PKG_SOURCE_VERSION:=5e88403fc0d39ae8a270d2c6c6e9c8a4d5232cf3
+-PKG_SOURCE_VERSION:=511a5b3c84fa715ef0305cf26c98619c12a4867a
-PKG_MIRROR_HASH:=a3dfc2cc6def3b634d8b7cda9139926be3d876cf2faa5251c4821987954442a5
+-PKG_MIRROR_HASH:=551d57b4c18da4c4695fa2f7a959c25a03be35d14cf872785e7db740f12366e2
 +PKG_SOURCE_DATE:=2021-07-19
 +PKG_SOURCE_VERSION:=350b960b6f8b08409dcef719ef1e1e0c8911040f
 +PKG_MIRROR_HASH:=94d489072f8fccc26f624c3d3c65e7cb40e4b6267df5fb39d4e0e78469006bde
--- a/patches/0024-ipq40xx-fix-ecw5211-support.patch
+++ b/patches/0024-ipq40xx-fix-ecw5211-support.patch
@@ -1,6 +1,6 @@
-From e443437d08651e307662a9e6c0ee050f0c0571f4 Mon Sep 17 00:00:00 2001
+From c82870ef8a2ae4798ede9393254c1e18798e5d01 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
-Date: Tue, 10 Aug 2021 07:57:35 +0200
+Date: Tue, 15 Jun 2021 17:03:14 +0200
 Subject: [PATCH] ipq40xx: fix ecw5211 support
 Signed-off-by: John Crispin <john@phrozen.org>
@@ -9,15 +9,15 @@ Signed-off-by: John Crispin <john@phrozen.org>
 1 file changed, 1 insertion(+)
 diff --git a/target/linux/ipq40xx/image/generic.mk b/target/linux/ipq40xx/image/generic.mk
-index 358a583f84..a435a127fa 100644
+index 1de17dd15a..487bba77b0 100644
 --- a/target/linux/ipq40xx/image/generic.mk
 +++ b/target/linux/ipq40xx/image/generic.mk
-@@ -355,6 +355,7 @@ define Device/edgecore_ecw5211
+@@ -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
+ 	DEVICE_PACKAGES := kmod-tpm-i2c-atmel kmod-usb-acm uboot-envtools
 endef
 TARGET_DEVICES += edgecore_ecw5211
 -- 
--- a/patches/0029-ipq4019-add-CIG-wf610d.patch
+++ b/patches/0029-ipq4019-add-CIG-wf610d.patch
@@ -1,26 +1,28 @@
-From 7712b93d2b82b0690ece8362631aee65f3f63a54 Mon Sep 17 00:00:00 2001
+From 859bdaad5959f972babb268eff24901b116703c8 Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
-Date: Tue, 10 Aug 2021 07:59:05 +0200
+Date: Tue, 13 Apr 2021 16:59:32 +0200
 Subject: [PATCH] ipq4019: add CIG wf610d
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
 package/firmware/ipq-wifi/Makefile            |   4 +-
 .../ipq-wifi/board-cig_wf610d.qca4019         | Bin 0 -> 24316 bytes
 .../ipq40xx/base-files/etc/board.d/01_leds    |   3 +
 .../ipq40xx/base-files/etc/board.d/02_network |   1 +
 .../etc/hotplug.d/firmware/11-ath10k-caldata  |   8 +
 .../lib/preinit/05_set_iface_mac_ipq40xx.sh   |   4 +
 .../boot/dts/qcom-ipq4029-ap-cig-wf610d.dts   | 409 ++++++++++++++++++
 target/linux/ipq40xx/image/generic.mk         |  14 +
- .../901-arm-boot-add-dts-files.patch          |   1 +
+ .../901-arm-boot-add-dts-files.patch          |   3 +-
- 8 files changed, 443 insertions(+), 1 deletion(-)
+ 9 files changed, 444 insertions(+), 2 deletions(-)
 create mode 100644 package/firmware/ipq-wifi/board-cig_wf610d.qca4019
 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 e3b25bb556..b996ee311f 100644
+index e5f10a1f98..513ad4ea67 100644
 --- a/package/firmware/ipq-wifi/Makefile
 +++ b/package/firmware/ipq-wifi/Makefile
-@@ -49,7 +49,8 @@ ALLWIFIBOARDS:= \
+@@ -47,7 +47,8 @@ ALLWIFIBOARDS:= \
 	nec_wg2600hp3 \
 	plasmacloud_pa1200 \
 	plasmacloud_pa2200 \
@@ -30,15 +32,75 @@ index e3b25bb556..b996ee311f 100644
 ALLWIFIPACKAGES:=$(foreach BOARD,$(ALLWIFIBOARDS),ipq-wifi-$(BOARD))
-@@ -135,5 +136,6 @@ $(eval $(call generate-ipq-wifi-package,nec_wg2600hp3,NEC Platforms WG2600HP3))
+@@ -131,5 +132,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))
 +$(eval $(call generate-ipq-wifi-package,cig_wf610d,CIG WF_610D))
 $(foreach PACKAGE,$(ALLWIFIPACKAGES),$(eval $(call BuildPackage,$(PACKAGE))))
 diff --git a/package/firmware/ipq-wifi/board-cig_wf610d.qca4019 b/package/firmware/ipq-wifi/board-cig_wf610d.qca4019
 new file mode 100644
 index 0000000000000000000000000000000000000000..3ba97ff0b9dc46519dc3767cac3931872a8cc5f1
 GIT binary patch
 literal 24316
 zcmeHPdr(tX8b9G7>e|8$2_oPngg}Ue0D)?d2mvDUNWoG?0xSYmB)3L+7!X4j?D(J%
 z5rJATM$j@SkEV!>i!WkvZS9Qm_s;&&cJ|SoS$AzmyVK6>F7COx+$4}h6CNYN{la;D
 z_k8Dk-|wCz_vZY#?<OULCG1Fvj7Sel%uL9V0EI#UpzIIFa{yvsDppo*DJm@vEmp|G
 z-Y=Dxg~|79i7>Q^4;EGI!JC4J(5j*edC`GGTar?@v34cz-WVAnfn(92JqwP-3NQaB
 zjRu_S=+W8uxEs1*RtUgqHxF0=fC0dpQHGlJjK^c+Lje#K74`Ger!)~`1^D$Zr{l@w
 z3<sE{+?{FHLd*o7LxIPpS~GjiY`cS_tOSrCaRDAvFR};jBUv|<@w4~XGzhG%HqOfe
 z#B17N*kI7jHSr8LH#b*TS7$Q;;0_+Cox+6u%##;vn<qPmF?Mr@Vr;zTm9pkReA!IN
 z^kBvYHBB{pbJJ6WW7jloHHzFFsflC#nv;zc@^@1=jt#(Cr93P3?O&nX|C+}IW1njp
 zYl?GI;lUwION~5tdurTRAKne>gwUX=u{u|p8f!3kz}*1Gu4+!f8Qw{a8T$enU<QL;
 zI7n%3x-bL|*IHASn<b2xGT=`4?<K7oC@<+U{V-)P9S`fRrGS$4$X+jPPg7BK%wBG`
 zU;21kMP0IjznhtOr@y>2`D93icVXv1UT4fnR;6cAZ)1@%ra1V$^{Ka84%BXyhvqTk
 zzUr&_H1j0Ca{c=^2dX>YX$q_MD;YUedN^(`FB^%u1^Y=bex7IC<z9J5O5<DAzNI%l
 zuj&e~^Dpx(e7#Vjyd@EEbzAkDH{20V=Gt|>>&Xv%vl9P|eUZR%-~|z$IXOAe@Z8xM
 zel4$<61OY$IT79uKHM%qIh;WF7sL(-2xJGa+1V~D?Y$-;eWl8|BaoAmmBD8F!-0PJ
 z<>`-;llT>okQWq4=>GfTpMEgc;T_knadUEU`5)}(4o{fL{@Jr9kBPo>_v*zXlnuh`
 z5!j`yu6Ynoc<&8U5<v(*G<0#+tVM>P2$Fy%AdzS!Ql>mockJWlwhqe*5KYN#hbnZG
 z&Zj@5BR;4P-$&|!dLZ6tBAUoge3*!&p=taysTdU_DX0Jy@C6SA$Yyjif3q|KjX;E`
 z(FyG(>s6yqB9YN6s%mk5?197+^?c%q_@cgiUuhDW^dt#MN7MP~(kL|QNfZ)`#`0sO
 z#7QvE4O0=&FL;ix-Lj9hgXSq{j$-!JVzp}R{W4qKQn)6iVzB4zQz%g=*+76=8a9BL
 zre2mPO+$ccPzX>6PzX>6PzX>6EMo-L3f3b2^lgG|NG5%gU=tEgUr7qcDsH_re9t^5
 zZ~YxBE$3K8%Dm07j87pIx`PNjvk(UdSg7uHvKE%=PJ%SQR6X(t09YPYcaJ=pSrR{j
 zhXivtuoePKHj72+mJS9B^|qR?am4@uo<H#F0f+>_ke?F_*+3jfg<`{mmo4;2z-IgT
 zv1dp-)LUxV?EE$k5D97E=Ys&WyCF1jGyowh5g-C0m%<eYaAG>G&WELkhhfukzQUl!
 zS%e5YA6mn3a@qrTAmHw@lgr9ap<IMQx;hGFE;?xr{BZ3a`Nmes4G!YG%0%qk5qovS
 z?woY{j-33$J*DcF_Kx%2Jy!;YMn>;^dH<V7jvp}F$8+q;^|k2@4Evx`dIPx=YS;sn
 zCN_|}poaZVsi1+}0d*Win-)tS-PdLrEG<Xv*)z__E+}a}d!bi%UH`SM`qDzh6b)mN
 zf%u_*d_O4zNG2tS6qWL&QVEEjj7CJLh%b^x&)faAX;w#SUIH%!r6&uLkqr7q!A2yG
 zo_h{|S&l(|&yl6Qw?bt9S5-R7xsQA)=l)n3jRpz#hg%E`aAr4*tPpay-G~SwgXzVb
 zdzmHY{;spTh)i?f++QO+Fy#xyxknMx8~_m9cefSJt}aIQI{??8J4(g3gL7{_Eu42+
 zb2beIg8}eFikFucz!NDBw&#O$&nD-#D7zUg%zCe%n4`?^ahjaNGB73f8BV9e*k@y{
 z*RtHorGmD$6lUrcAxbk{q}mh$6ao|iO9=rJXWkm;{y+ct>-XP%_eU5o!NbQn_s{?J
 z_dh>={5Pnx#km)Wq9X{-{^aDpf0}<DzBSH0$CkifcP$RhMn{gqM*WQA%|d5w?NFS1
 z;tun+=|*!IR_*!y#GGwU)D4gkXf1e-uU&J#Jzk$9<vvK7ga6Qd=h5^#3{%V6`^8-M
 z?XbRGTcygDg@1cPuhG`33S>h4b?sSIxhz>2q#xGxs8yIu=!gHG*zLRA5C9F@v`W=Z
 z8Gm9(cSd~>%aRFoBie2ZlVu1)^}pA)suZ$BAqzLSGtT7#LpMy7t;(LbsXMP$V(-Z|
 z>29jeVihS8p#U1RsrHiwW8+*Nn7FOGpss@BzO5h9eWtF(WHOOXuhw9PQnrS88)o<b
 z%OhOUk3*LxZs;`HqiO}VRex1?N!tjGGjzAqomf>$N{Fw1RQrj+C4bzdyZ1tP0EXJ7
 zJFQi!3!zI|?QwOvN~XK2?ZOl(3BvG+Te?f?8f=%)hcMs;<1w^qkElyj8Svl*^<iwg
 zEF3!0sZz?)g}jODx^wCZEHj0J8+<v=gD73ocWNuu1uDtJC_GrH%E!{6n-?LLVj&8T
 zp4V1mNh#|L2KQkMj>sas)Tdms=LAwHQ7G9!U@0sO8=+C^Ws5+^@PW(m?O_eRRTp)?
 z)kscrYu6n(bT;`IuiU42P4eBIy{ERQ0{5+zT^v4iIk7Fg!B;svRH98g^VaWt51#JM
 zZjL;{!rU{y>f7Hct`AbID^L&Z>=K^wucc!ReFf(QCr~B5c=Ss7S@B1_3i{4_{qnZ>
 z`oR6(1+@b^FN8JtRJ~c$KUDphxH+VDZK+z5aXj)6bJrVNZ}b(nZmwf}z|8x@4OM@p
 zhI`aYp}VTQ6x+zIqVI0(%sdfY<t<y2a&2JuC&G{X70iNOoxDqOnx#Yv`vxktqT}px
 z57|gpMRQVZsKP7j!53*wp*8DDJa+XB?dwi%<s4y@bo3v%5Z@Slm{D}OQ{E7#+_29x
 zz4yw&bFs$)D;Ndm`ieRengS~61?|1^bD|T0m7e*hns<E|jj{9S;^F?v^BJc?s=fCv
 z+l4~~P9d-a5TH4`t~5S^!*o+-tdZn%TP1uBmPxGOG1O8jHavmDBPfUi|KQU%Sb+fn
 z?0{^rXr91f$%i*aJ8%2-mUEDl`&IKchZXoK6@`FR1S}}`&t`P9m+&#){bsna+?p@r
 z+%L}O%urs<*Asvi|9Us$+Is@f^CnF2$&+Hp!C&3OtH)E?xT!So=AB%oc=LcJft>vf
 zF`RM_mq_4NznVoP7g!Q$@yEY>J;XWjE|3$S({bhgLU7_28d+Ohds6=@`S$qS6zATs
 p*EQRW;@r;`Im&L)B4E#+u`Qmxxqi_GI7i1Q&iz7vYrc5={{xZF3n~Br
 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 ac11655904..c1d4e693f2 100755
+index 3e0f3ab258..f9674126ba 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)
@@ -49,7 +111,7 @@ index ac11655904..c1d4e693f2 100755
 engenius,eap1300)
 	ucidef_set_led_netdev "lan" "LAN" "blue:lan" "eth0"
 	ucidef_set_led_wlan "wlan2g" "WLAN2G" "blue:wlan2g" "phy0tpt"
-@@ -69,6 +70,8 @@ qxwlan,e2600ac-c2)
+@@ -61,6 +62,8 @@ qxwlan,e2600ac-c2)
 	ucidef_set_led_wlan "wlan2g" "WLAN0" "green:wlan0" "phy0tpt"
 	ucidef_set_led_wlan "wlan5g" "WLAN1" "green:wlan1" "phy1tpt"
 	;;
@@ -59,10 +121,10 @@ index ac11655904..c1d4e693f2 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 1d4c78833a..d62a2e5061 100755
+index 8b7364ff33..dcdb790c84 100755
 --- a/target/linux/ipq40xx/base-files/etc/board.d/02_network
 +++ b/target/linux/ipq40xx/base-files/etc/board.d/02_network
-@@ -42,6 +42,7 @@ ipq40xx_setup_interfaces()
+@@ -41,6 +41,7 @@ ipq40xx_setup_interfaces()
 		;;
 	asus,map-ac2200|\
 	cilab,meshpoint-one|\
@@ -71,7 +133,7 @@ index 1d4c78833a..d62a2e5061 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 b7ee73b12e..3948c08984 100644
+index 6670d310db..5eae9c6e80 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
@@ -85,7 +147,7 @@ index b7ee73b12e..3948c08984 100644
 	cellc,rtl30vw |\
 	compex,wpj419 |\
 	compex,wpj428 |\
-@@ -202,6 +206,10 @@ case "$FIRMWARE" in
+@@ -197,6 +201,10 @@ case "$FIRMWARE" in
 		caldata_extract "ART" 0x5000 0x2f20
 		ath10k_patch_mac $(mtd_get_mac_binary ORGDATA 0x2c)
 		;;
@@ -527,10 +589,10 @@ index 0000000000..e75e35e8ef
 +
 +};
 diff --git a/target/linux/ipq40xx/image/generic.mk b/target/linux/ipq40xx/image/generic.mk
-index a435a127fa..31f4971c90 100644
+index 4e40b8be50..1de17dd15a 100644
 --- a/target/linux/ipq40xx/image/generic.mk
 +++ b/target/linux/ipq40xx/image/generic.mk
-@@ -271,6 +271,20 @@ define Device/cilab_meshpoint-one
+@@ -273,6 +273,20 @@ define Device/cilab_meshpoint-one
 endef
 TARGET_DEVICES += cilab_meshpoint-one
@@ -552,10 +614,19 @@ index a435a127fa..31f4971c90 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 6b7c68bf63..49254efd75 100644
+index a3d3341587..aec0d01ed6 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
-@@ -45,6 +45,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
+@@ -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,59 @@ 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>
  	qcom-ipq4019-ap.dk07.1-c1.dtb \
  	qcom-ipq4019-ap.dk07.1-c2.dtb \
 +	qcom-ipq4019-a62.dtb \
--- a/patches/0031-ath10k-ct-update-the-driver.patch
+++ b/patches/0031-ath10k-ct-update-the-driver.patch
@@ -1,30 +1,75 @@
-From 0d42dfd0a71893ba79f9430d20f8cc145283794a Mon Sep 17 00:00:00 2001
+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 +++---
+ package/kernel/ath10k-ct/Makefile             |  6 +--
- 1 file changed, 3 insertions(+), 3 deletions(-)
+ ...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 5681c5c2cd..24e0702e2c 100644
+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-06-03
+-PKG_SOURCE_DATE:=2021-01-11
-PKG_SOURCE_VERSION:=b44cd7b2e7b0df5995ece18f358d4dfc40834ba1
+-PKG_SOURCE_VERSION:=9fe1df7d4f783b6b0cd1c99d11979e5a6e6fc40b
-PKG_MIRROR_HASH:=59f961ad425eb1a48fa9c391a325cc0f23845daec9d12673445d3077f9756cf0
+-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/0032-ipq40xx-add-tplink-ec420-support.patch
+++ b/patches/0032-ipq40xx-add-tplink-ec420-support.patch
--- a/patches/0035-ath79-various-fixes.patch
+++ b/patches/0035-ath79-various-fixes.patch
@@ -1,4 +1,4 @@
-From 3f0b34ab5f0889c49d3484b07e0045b2ef445f70 Mon Sep 17 00:00:00 2001
+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
@@ -9,29 +9,38 @@ Subject: [PATCH] ath79: various fixes
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
- target/linux/ath79/dts/ar9344_tplink_cpe.dtsi       | 13 ++++++++++---
+ target/linux/ath79/dts/ar9344_tplink_cpe.dtsi | 20 ++++++++-----------
- .../ath79/generic/base-files/etc/board.d/02_network |  3 ++-
+ .../generic/base-files/etc/board.d/02_network |  3 ++-
- tools/firmware-utils/src/tplink-safeloader.c        |  3 ++-
+ tools/firmware-utils/src/tplink-safeloader.c  |  4 ++--
- 3 files changed, 14 insertions(+), 5 deletions(-)
+ 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 fd6aa0f08b..2b663a938e 100644
+index d4b7de440a..c5ab963174 100644
 --- a/target/linux/ath79/dts/ar9344_tplink_cpe.dtsi
 +++ b/target/linux/ath79/dts/ar9344_tplink_cpe.dtsi
-@@ -60,9 +60,16 @@
+@@ -59,20 +59,16 @@
 			partition@40000 {
 				label = "firmware";
 				reg = <0x040000 0x780000>;
 -				compatible = "openwrt,uimage", "denx,uimage";
 -				openwrt,ih-magic = <IH_MAGIC_OKLI>;
 -				openwrt,offset = <0x3000>;
 +			};
-+
+ 
 -				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>;
@@ -39,10 +48,10 @@ index fd6aa0f08b..2b663a938e 100644
 			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 d70432ad2b..b0b152ba74 100755
+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
-@@ -95,7 +95,7 @@ ath79_setup_interfaces()
+@@ -94,7 +94,7 @@ ath79_setup_interfaces()
 	ubnt,unifi|\
 	wd,mynet-wifi-rangeextender|\
 	winchannel,wb2000)
@@ -51,7 +60,7 @@ index d70432ad2b..b0b152ba74 100755
 		;;
 	airtight,c-75)
 		ucidef_add_switch "switch0" \
-@@ -675,6 +675,7 @@ ath79_setup_macs()
+@@ -669,6 +669,7 @@ ath79_setup_macs()
 board_config_update
 board=$(board_name)
@@ -60,14 +69,15 @@ index d70432ad2b..b0b152ba74 100755
 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 c519a6d367..a0390c3797 100644
+index ac71b3305e..2bc4a3cb82 100644
 --- a/tools/firmware-utils/src/tplink-safeloader.c
 +++ b/tools/firmware-utils/src/tplink-safeloader.c
-@@ -439,7 +439,8 @@ static struct device_info boards[] = {
+@@ -443,8 +443,8 @@ static struct device_info boards[] = {
 			{"default-mac", 0x30000, 0x00020},
 			{"product-info", 0x31100, 0x00100},
 			{"signature", 0x32000, 0x00400},
-			{"firmware", 0x40000, 0x770000},
+-			{"os-image", 0x40000, 0x300000},
 -			{"file-system", 0x340000, 0x470000},
 +			{"os-image", 0x40000, 0x210000},
 +			{"file-system", 0x250000, 0x560000},
 			{"soft-version", 0x7b0000, 0x00100},
--- a/patches/0037-ipq4018-add-EdgeCore-SPW2AC1200-support.patch
+++ b/patches/0037-ipq4018-add-EdgeCore-SPW2AC1200-support.patch
@@ -1,7 +1,7 @@
-From 77b6aa80cb737f4a7c92a0b20375260874e7e265 Mon Sep 17 00:00:00 2001
+From c651355c099a42c12f1953f4d027b32172a45bbb Mon Sep 17 00:00:00 2001
 From: John Crispin <john@phrozen.org>
-Date: Tue, 10 Aug 2021 08:05:13 +0200
+Date: Thu, 1 Jul 2021 16:37:24 +0200
-Subject: [PATCH 1/4] ipq4018: add EdgeCore SPW2AC1200 support
+Subject: [PATCH] ipq4018: add EdgeCore SPW2AC1200 support
 Signed-off-by: John Crispin <john@phrozen.org>
 ---
@@ -12,8 +12,8 @@ Signed-off-by: John Crispin <john@phrozen.org>
 .../base-files/lib/upgrade/platform.sh        |   4 +-
 .../arm/boot/dts/qcom-ipq4018-spw2ac1200.dts  | 332 ++++++++++++++++++
 target/linux/ipq40xx/image/generic.mk         |  13 +
- .../901-arm-boot-add-dts-files.patch          |   9 +-
+ .../901-arm-boot-add-dts-files.patch          |   3 +-
- 8 files changed, 359 insertions(+), 4 deletions(-)
+ 8 files changed, 355 insertions(+), 2 deletions(-)
 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
@@ -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 c1d4e693f2..d473448137 100755
+index f9674126ba..efd5d002db 100755
 --- a/target/linux/ipq40xx/base-files/etc/board.d/01_leds
 +++ b/target/linux/ipq40xx/base-files/etc/board.d/01_leds
-@@ -71,6 +71,7 @@ qxwlan,e2600ac-c2)
+@@ -63,6 +63,7 @@ qxwlan,e2600ac-c2)
 	ucidef_set_led_wlan "wlan5g" "WLAN1" "green:wlan1" "phy1tpt"
 	;;
 edgecore,ecw5211 |\
@@ -41,10 +41,10 @@ index c1d4e693f2..d473448137 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 16f6040b6e..0240798bbb 100755
+index 597fa9f08b..7bc8c5e6aa 100755
 --- a/target/linux/ipq40xx/base-files/etc/board.d/02_network
 +++ b/target/linux/ipq40xx/base-files/etc/board.d/02_network
-@@ -45,6 +45,7 @@ ipq40xx_setup_interfaces()
+@@ -43,6 +43,7 @@ ipq40xx_setup_interfaces()
 	cilab,meshpoint-one|\
 	cig,wf610d|\
 	edgecore,ecw5211|\
@@ -53,10 +53,10 @@ index 16f6040b6e..0240798bbb 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 c8943d3ba3..ad2946f636 100644
+index a9bbc791b8..da7931d018 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
-@@ -104,6 +104,7 @@ case "$FIRMWARE" in
+@@ -101,6 +101,7 @@ case "$FIRMWARE" in
 	compex,wpj419 |\
 	compex,wpj428 |\
 	edgecore,ecw5211 |\
@@ -64,7 +64,7 @@ index c8943d3ba3..ad2946f636 100644
 	edgecore,oap100 |\
 	engenius,eap1300 |\
 	engenius,eap2200 |\
-@@ -220,6 +221,7 @@ case "$FIRMWARE" in
+@@ -212,6 +213,7 @@ case "$FIRMWARE" in
 	compex,wpj419 |\
 	compex,wpj428 |\
 	edgecore,ecw5211 |\
@@ -73,7 +73,7 @@ index c8943d3ba3..ad2946f636 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 cbdd12c750..84abd181dc 100644
+index 530545e442..f6fc828134 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 d12c48a481..ffaf52b553 100644
+index ee648edc50..e4e437bb95 100644
 --- a/target/linux/ipq40xx/image/generic.mk
 +++ b/target/linux/ipq40xx/image/generic.mk
-@@ -374,6 +374,19 @@ define Device/edgecore_ecw5211
+@@ -376,6 +376,19 @@ define Device/edgecore_ecw5211
 endef
 TARGET_DEVICES += edgecore_ecw5211
@@ -450,25 +450,19 @@ index d12c48a481..ffaf52b553 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 49254efd75..4539709fb0 100644
+index aec0d01ed6..492cc67b2c 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
-@@ -8,9 +8,11 @@ Signed-off-by: John Crispin <john@phrozen.org>
+@@ -10,7 +10,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
  arch/arm/boot/dts/Makefile | 23 +++++++++++++++++++++++
  1 file changed, 23 insertions(+)
---- a/arch/arm/boot/dts/Makefile
+ --- a/arch/arm/boot/dts/Makefile
-+++ b/arch/arm/boot/dts/Makefile
+ +++ b/arch/arm/boot/dts/Makefile
-@@ -837,11 +837,60 @@ dtb-$(CONFIG_ARCH_QCOM) += \
+-@@ -837,11 +837,59 @@ dtb-$(CONFIG_ARCH_QCOM) += \
-+Index: linux-5.4.137/arch/arm/boot/dts/Makefile
+@@ -837,11 +837,60 @@ dtb-$(CONFIG_ARCH_QCOM) += \
 +===================================================================
 +--- linux-5.4.137.orig/arch/arm/boot/dts/Makefile
 ++++ linux-5.4.137/arch/arm/boot/dts/Makefile
 +@@ -837,11 +837,62 @@ dtb-$(CONFIG_ARCH_QCOM) += \
  	qcom-apq8074-dragonboard.dtb \
  	qcom-apq8084-ifc6540.dtb \
  	qcom-apq8084-mtp.dtb \
-@@ -22,6 +24,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
+@@ -22,6 +22,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
 +	qcom-ipq4018-ea6350v3.dtb \
 +	qcom-ipq4018-eap1300.dtb \
 +	qcom-ipq4018-ecw5211.dtb \
--- a/patches/0038-Revert-libusb-update-to-1.0.24.patch
+++ b/patches/0038-Revert-libusb-update-to-1.0.24.patch
@@ -1,19 +1,15 @@
-From 7423a1e0d1e571b82be86055ce7199608c82de9a Mon Sep 17 00:00:00 2001
+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 1/3] Revert "libusb: update to 1.0.24"
+Subject: [PATCH] Revert "libusb: update to 1.0.24"
 This reverts commit 0798b13d7df0deafd005b14d52420c4f480d146e.
 ---
- package/libs/libusb/Makefile                  |  6 +-
+ package/libs/libusb/Makefile | 6 +++---
- ...n-the-Changelog-and-clean-up-a-stray.patch | 29 ---------
+ 1 file changed, 3 insertions(+), 3 deletions(-)
 ...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
+index e931536339..1667fb2840 100644
 --- a/package/libs/libusb/Makefile
 +++ b/package/libs/libusb/Makefile
@@ -8,14 +8,14 @@
@@ -21,7 +17,7 @@ index 6b80b3848d..1667fb2840 100644
 PKG_NAME:=libusb
 -PKG_VERSION:=1.0.24
-PKG_RELEASE:=$(AUTORELEASE)
+-PKG_RELEASE:=1
 +PKG_VERSION:=1.0.22
 +PKG_RELEASE:=2
@@ -34,108 +30,6 @@ index 6b80b3848d..1667fb2840 100644
 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