Compare revisions

Tom Herbers · Tom Herbers · David Bauer · Nico · Nico · Nico
--- a/modules
+++ b/modules
@@ -2,11 +2,11 @@ GLUON_FEEDS='packages routing gluon'

 OPENWRT_REPO=https://github.com/openwrt/openwrt.git
 OPENWRT_BRANCH=openwrt-22.03
-OPENWRT_COMMIT=074db5793641b197892f210d60223f17340d9e6f
+OPENWRT_COMMIT=3960c220daabe5b58381af1a8c7b9dd2e6b7e815

 PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git
 PACKAGES_PACKAGES_BRANCH=openwrt-22.03
-PACKAGES_PACKAGES_COMMIT=7158688679d3411f635ce0a7f83984b7d65cfb28
+PACKAGES_PACKAGES_COMMIT=d057936acbefd76b033e7c365baa68b48ccb9166

 PACKAGES_ROUTING_REPO=https://github.com/openwrt/routing.git
 PACKAGES_ROUTING_BRANCH=openwrt-22.03

--- a/patches/openwrt/0004-ramips-mt7621-make-DSA-images-swconfig-upgradable.patch
+++ b/patches/openwrt/0004-ramips-mt7621-make-DSA-images-swconfig-upgradable.patch
@@ -3,7 +3,7 @@ Date: Sun, 5 Jun 2022 23:43:38 +0200
 Subject: ramips-mt7621: make DSA images swconfig upgradable

 diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk
-index c3e2291a9d91bae234707b1d81277b645bdd6920..64e02a53d30b71144ef4158a06c3a791f8d91f90 100644
+index 9c451c26bf180a0ea45a33f567def4770b07398e..08f80b9b635adf525003498a34601e81da520978 100644
 --- a/target/linux/ramips/image/mt7621.mk
 +++ b/target/linux/ramips/image/mt7621.mk
 @@ -180,7 +180,6 @@ endef
@@ -14,7 +14,7 @@ index c3e2291a9d91bae234707b1d81277b645bdd6920..64e02a53d30b71144ef4158a06c3a791
   DEVICE_VENDOR := ASUS
   DEVICE_MODEL := RT-AC57U
   DEVICE_ALT0_VENDOR := ASUS
-@@ -1271,7 +1270,6 @@ endef
+@@ -1272,7 +1271,6 @@ endef
 TARGET_DEVICES += mts_wg430223
 
 define Device/netgear_ex6150
@@ -22,7 +22,7 @@ index c3e2291a9d91bae234707b1d81277b645bdd6920..64e02a53d30b71144ef4158a06c3a791
   $(Device/uimage-lzma-loader)
   DEVICE_VENDOR := NETGEAR
   DEVICE_MODEL := EX6150
-@@ -1284,7 +1282,6 @@ endef
+@@ -1285,7 +1283,6 @@ endef
 TARGET_DEVICES += netgear_ex6150
 
 define Device/netgear_sercomm_nand
@@ -30,7 +30,7 @@ index c3e2291a9d91bae234707b1d81277b645bdd6920..64e02a53d30b71144ef4158a06c3a791
   $(Device/uimage-lzma-loader)
   BLOCKSIZE := 128k
   PAGESIZE := 2048
-@@ -1467,7 +1464,6 @@ endef
+@@ -1468,7 +1465,6 @@ endef
 TARGET_DEVICES += netgear_wax202
 
 define Device/netgear_wndr3700-v5
@@ -38,7 +38,7 @@ index c3e2291a9d91bae234707b1d81277b645bdd6920..64e02a53d30b71144ef4158a06c3a791
   $(Device/netgear_sercomm_nor)
   $(Device/uimage-lzma-loader)
   IMAGE_SIZE := 15232k
-@@ -1804,7 +1800,6 @@ endef
+@@ -1805,7 +1801,6 @@ endef
 TARGET_DEVICES += tplink_tl-wpa8631p-v3
 
 define Device/ubnt_edgerouter_common
@@ -46,7 +46,7 @@ index c3e2291a9d91bae234707b1d81277b645bdd6920..64e02a53d30b71144ef4158a06c3a791
   $(Device/uimage-lzma-loader)
   DEVICE_VENDOR := Ubiquiti
   IMAGE_SIZE := 256768k
-@@ -2220,7 +2215,6 @@ endef
+@@ -2221,7 +2216,6 @@ endef
 TARGET_DEVICES += zbtlink_zbt-wg2626
 
 define Device/zbtlink_zbt-wg3526-16m
@@ -54,7 +54,7 @@ index c3e2291a9d91bae234707b1d81277b645bdd6920..64e02a53d30b71144ef4158a06c3a791
   $(Device/uimage-lzma-loader)
   IMAGE_SIZE := 16064k
   DEVICE_VENDOR := Zbtlink
-@@ -2233,7 +2227,6 @@ endef
+@@ -2234,7 +2228,6 @@ endef
 TARGET_DEVICES += zbtlink_zbt-wg3526-16m
 
 define Device/zbtlink_zbt-wg3526-32m

--- a/patches/openwrt/0007-kernel-bridge-Implement-MLD-Querier-wake-up-calls-Android-bug-workaround.patch
+++ b/patches/openwrt/0007-kernel-bridge-Implement-MLD-Querier-wake-up-calls-Android-bug-workaround.patch
--- a/patches/openwrt/0006-lantiq-xrx200-make-DSA-images-swconfig-upgradable.patch
+++ b/patches/openwrt/0006-lantiq-xrx200-make-DSA-images-swconfig-upgradable.patch
--- a/patches/openwrt/0011-ath79-combine-OCEDO-dual-firmware-partitions.patch
+++ b/patches/openwrt/0011-ath79-combine-OCEDO-dual-firmware-partitions.patch
@@ -83,10 +83,10 @@ index 2dc4c07e918c50eb522100eb7f72c8804d5ba5fb..f8b3681bb7f143a498d5cb64897af335
 
 			partition@ed0000 {
 diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk
-index 31d296fb62a1bb3fee4dfaba894f8339c48dd59c..deb5644ef525cf85ab7671d053d4ae6f2ee8e951 100644
+index f1542e4e38f7540dd9facf4c40f0b271b9ea1e45..87d01a42eda274f9197f3382d955b87ecf615f7d 100644
 --- a/target/linux/ath79/image/generic.mk
 +++ b/target/linux/ath79/image/generic.mk
-@@ -1797,7 +1797,7 @@ define Device/ocedo_koala
+@@ -1803,7 +1803,7 @@ define Device/ocedo_koala
   DEVICE_MODEL := Koala
   DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct
   SUPPORTED_DEVICES += koala
@@ -95,7 +95,7 @@ index 31d296fb62a1bb3fee4dfaba894f8339c48dd59c..deb5644ef525cf85ab7671d053d4ae6f
 endef
 TARGET_DEVICES += ocedo_koala
 
-@@ -1805,7 +1805,7 @@ define Device/ocedo_raccoon
+@@ -1811,7 +1811,7 @@ define Device/ocedo_raccoon
   SOC := ar9344
   DEVICE_VENDOR := Ocedo
   DEVICE_MODEL := Raccoon
@@ -104,7 +104,7 @@ index 31d296fb62a1bb3fee4dfaba894f8339c48dd59c..deb5644ef525cf85ab7671d053d4ae6f
 endef
 TARGET_DEVICES += ocedo_raccoon
 
-@@ -1814,7 +1814,7 @@ define Device/ocedo_ursus
+@@ -1820,7 +1820,7 @@ define Device/ocedo_ursus
   DEVICE_VENDOR := Ocedo
   DEVICE_MODEL := Ursus
   DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct

--- a/patches/openwrt/0011-ath79-support-for-TP-Link-EAP225-Outdoor-v3.patch
+++ b/patches/openwrt/0011-ath79-support-for-TP-Link-EAP225-Outdoor-v3.patch
+From: Paul Maruhn <paulmaruhn@posteo.de>
+Date: Tue, 22 Mar 2022 21:06:42 +0100
+Subject: ath79: support for TP-Link EAP225-Outdoor v3
+
+[ nrb: backported from 7e4de89e631aaf56be5375662b7d5ed0f27e26f6 ]
+
+This model is almost identical to the EAP225-Outdoor v1.
+Major difference is the RTL8211FS PHY Chipset.
+
+Device specifications:
+* SoC: QCA9563 @ 775MHz
+* Memory: 128MiB DDR2
+* Flash: 16MiB SPI-NOR
+* Wireless 2.4GHz (SoC): b/g/n 2x2
+* Wireless 5GHz (QCA9886): a/n/ac 2x2 MU-MIMO
+* Ethernet (RTL8211FS): 1× 1GbE, PoE
+
+Flashing instructions:
+* ssh into target device with recent (>= v1.6.0) firmware
+* run `cliclientd stopcs` on target device
+* upload factory image via web interface
+
+Debricking:
+To recover the device, you need access to the serial port. This requires
+fine soldering to test points, or the use of probe pins.
+* Open the case and solder wires to the test points: RXD, TXD and TPGND4
+  * Use a 3.3V UART, 115200 baud, 8n1
+* Interrupt bootloader by holding ctrl+B during boot
+* upload initramfs via built-in tftp client and perform sysupgrade
+    setenv ipaddr 192.168.1.1 # default, change as required
+    setenv serverip 192.168.1.10 # default, change as required
+    tftp 0x80800000 initramfs.bin
+    bootelf $fileaddr
+
+MAC addresses:
+MAC address (as on device label) is stored in device info partition at
+an offset of 8 bytes. ath9k device has same address as ethernet, ath10k
+uses address incremented by 1.
+From stock ifconfig:
+
+    ath0      Link encap:Ethernet  HWaddr D8:...:2E
+    ath10     Link encap:Ethernet  HWaddr D8:...:2F
+    br0       Link encap:Ethernet  HWaddr D8:...:2E
+    eth0      Link encap:Ethernet  HWaddr D8:...:2E
+
+Signed-off-by: Paul Maruhn <paulmaruhn@posteo.de>
+Co-developed-by: Philipp Rothmann <philipprothmann@posteo.de>
+Signed-off-by: Philipp Rothmann <philipprothmann@posteo.de>
+[Add pre-calibraton nvme-cells]
+Tested-by: Tido Klaassen <tido_ff@4gh.eu>
+Signed-off-by: Nick Hainke <vincent@systemli.org>
+Signed-off-by: Nico <github@nicoboehr.de>
+
+diff --git a/target/linux/ath79/dts/qca9563_tplink_eap225-outdoor-v3.dts b/target/linux/ath79/dts/qca9563_tplink_eap225-outdoor-v3.dts
+new file mode 100644
+index 0000000000000000000000000000000000000000..e5914c9a55069e5baa5c7b989f3405c762e4d29d
+--- /dev/null
+++ b/target/linux/ath79/dts/qca9563_tplink_eap225-outdoor-v3.dts
+@@ -0,0 +1,59 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+
+#include "qca9563_tplink_eap2x5-1port.dtsi"
+
+/ {
+	compatible = "tplink,eap225-outdoor-v3", "qca,qca9563";
+	model = "TP-Link EAP225-Outdoor v3";
+
+	aliases {
+		led-boot = &led_status_green;
+		led-failsafe = &led_status_amber;
+		led-running = &led_status_green;
+		led-upgrade = &led_status_amber;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		led_status_green: status_green {
+			label = "green:status";
+			gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
+			default-state = "on";
+		};
+
+		led_status_amber: status_amber {
+			label = "amber:status";
+			gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
+		};
+	};
+};
+
+&art {
+	precalibration_ath10k: pre-calibration@5000 {
+		reg = <0x5000 0x2f20>;
+	};
+};
+
+&eth0 {
+	phy-handle = <&phy6>;
+	phy-mode = "sgmii";
+};
+
+&mdio0 {
+	phy6: ethernet-phy@6 {
+		reg = <6>;
+	};
+};
+
+&pcie {
+	wifi@0,0 {
+		compatible = "qcom,ath10k";
+		reg = <0 0 0 0 0>;
+
+		mac-address-increment = <1>;
+
+		nvmem-cells = <&macaddr_info_8>, <&precalibration_ath10k>;
+		nvmem-cell-names = "mac-address", "pre-calibration";
+	};
+};
+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 8f9516b8c681fd09c37fb183a63c17cf84f94bfc..b17ef03afcdf12c7a2c51fa8b0eaf3c90ad6fdd9 100644
+--- a/target/linux/ath79/generic/base-files/etc/board.d/02_network
+++ b/target/linux/ath79/generic/base-files/etc/board.d/02_network
+@@ -78,6 +78,7 @@ ath79_setup_interfaces()
+ 	tplink,cpe610-v2|\
+ 	tplink,cpe710-v1|\
+ 	tplink,eap225-outdoor-v1|\
+	tplink,eap225-outdoor-v3|\
+ 	tplink,eap225-v1|\
+ 	tplink,eap225-v3|\
+ 	tplink,eap245-v1|\
+diff --git a/target/linux/ath79/image/generic-tp-link.mk b/target/linux/ath79/image/generic-tp-link.mk
+index fed572c884c75bd21081c7c22dd4652ecefdd993..3d3a45711302b7a73c914d80ec0d309878813149 100644
+--- a/target/linux/ath79/image/generic-tp-link.mk
+++ b/target/linux/ath79/image/generic-tp-link.mk
+@@ -401,6 +401,17 @@ define Device/tplink_eap225-outdoor-v1
+ endef
+ TARGET_DEVICES += tplink_eap225-outdoor-v1
+ 
+define Device/tplink_eap225-outdoor-v3
+  $(Device/tplink-eap2x5)
+  SOC := qca9563
+  IMAGE_SIZE := 13824k
+  DEVICE_MODEL := EAP225-Outdoor
+  DEVICE_VARIANT := v3
+  DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca9888-ct
+  TPLINK_BOARD_ID := EAP225-V3
+endef
+TARGET_DEVICES += tplink_eap225-outdoor-v3
+
+ define Device/tplink_eap225-v1
+   $(Device/tplink-eap2x5)
+   SOC := qca9563
+diff --git a/tools/firmware-utils/patches/003-tplink-safeloader-join-EAP225-V3-compatible-devices.patch b/tools/firmware-utils/patches/003-tplink-safeloader-join-EAP225-V3-compatible-devices.patch
+new file mode 100644
+index 0000000000000000000000000000000000000000..f02ce72973c11e9e4dbb93f43e39cf073732f392
+--- /dev/null
+++ b/tools/firmware-utils/patches/003-tplink-safeloader-join-EAP225-V3-compatible-devices.patch
+@@ -0,0 +1,61 @@
+From a1f0f969f52cb73f77b44ea8bb9e654e18ca3dbb Mon Sep 17 00:00:00 2001
+From: Sander Vanheule <sander@svanheule.net>
+Date: Thu, 26 May 2022 09:11:29 +0200
+Subject: [PATCH 1/4] tplink-safeloader: join EAP225-V3 compatible devices
+
+Since FW v5.0.0, TP-Link has provided unified firmware images for
+EAP225-v3 and EAP225-Outdoor-v1 devices. Although there may be hardware
+differences, the relevant details for image generation are identical.
+
+More recently, the following devices have also been added to the support
+list:
+  - EAP225-v3.20
+  - EAP225-Outdoor-v3
+  - EAP225-v4
+
+The country codes appended the device descriptors were introduced with
+FW v5.0.7: "Combined firmware versions for different countries/regions."
+The release notes provide no further upgrade instructions, so these
+firmware images should be backwards compatible.
+
+Add the new compatible devices, with region codes, to the support list
+of the EAP225-V3 board ID. The now redundant EAP225-OUTDOOR-V1 ID will
+be dropped later.
+
+Signed-off-by: Sander Vanheule <sander@svanheule.net>
+---
+ src/tplink-safeloader.c | 14 ++++++++++++--
+ 1 file changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/src/tplink-safeloader.c b/src/tplink-safeloader.c
+index fc46124..a42ce6a 100644
+--- a/src/tplink-safeloader.c
++++ b/src/tplink-safeloader.c
+@@ -1603,12 +1603,22 @@ static struct device_info boards[] = {
+ 		.last_sysupgrade_partition = "file-system"
+ 	},
+ 
+-	/** Firmware layout for the EAP225 v3 */
++	/** Firmware layout for the EAP225 v3
++	 * Also compatible with:
++	 *   - EAP225 v3.20
++	 *   - EAP225 v4
++	 *   - EAP225-Outdoor v1
++	 *   - EAP225-Outdoor v3
++	 *   */
+ 	{
+ 		.id     = "EAP225-V3",
+ 		.support_list =
+ 			"SupportList:\r\n"
+-			"EAP225(TP-Link|UN|AC1350-D):3.0\r\n",
++			"EAP225(TP-Link|UN|AC1350-D):3.0\r\n"
++			"EAP225(TP-Link|UN|AC1350-D):3.20\r\n"
++			"EAP225(TP-Link|UN|AC1350-D):4.0 CA\r\n"
++			"EAP225-Outdoor(TP-Link|UN|AC1350-D):1.0\r\n"
++			"EAP225-Outdoor(TP-Link|UN|AC1350-D):3.0 CA,JP\r\n",
+ 		.part_trail = PART_TRAIL_NONE,
+ 		.soft_ver = SOFT_VER_DEFAULT,
+ 		.soft_ver_compat_level = 1,
+-- 
+2.30.2
+
+diff --git a/tools/firmware-utils/patches/004-tplink-safeloader-add-regionless-EAP225-V3-IDs.patch b/tools/firmware-utils/patches/004-tplink-safeloader-add-regionless-EAP225-V3-IDs.patch
+new file mode 100644
+index 0000000000000000000000000000000000000000..13f433b7e751b8fd54d790fbcdee22a426a65d79
+--- /dev/null
+++ b/tools/firmware-utils/patches/004-tplink-safeloader-add-regionless-EAP225-V3-IDs.patch
+@@ -0,0 +1,36 @@
+From 17896956efd9d42baebf9558242dcdf4b5a9cbe1 Mon Sep 17 00:00:00 2001
+From: Sander Vanheule <sander@svanheule.net>
+Date: Sun, 26 Jun 2022 16:30:34 +0200
+Subject: [PATCH 2/4] tplink-safeloader: add regionless EAP225-V3 IDs
+
+Devices whose model ID does not contain a region identifier will not
+match the "CA" and "CA,JP" qualified model IDs in the current EAP225-V3
+SupportList. This results in the stock firmware giving the following
+error when trying to flash a factory image:
+    Upgrade failed because the firmware is incompatible
+
+Add the IDs without region qualifiers to also support these devices.
+
+Signed-off-by: Sander Vanheule <sander@svanheule.net>
+---
+ src/tplink-safeloader.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/tplink-safeloader.c b/src/tplink-safeloader.c
+index a42ce6a..3f58f95 100644
+--- a/src/tplink-safeloader.c
++++ b/src/tplink-safeloader.c
+@@ -1616,8 +1616,10 @@ static struct device_info boards[] = {
+ 			"SupportList:\r\n"
+ 			"EAP225(TP-Link|UN|AC1350-D):3.0\r\n"
+ 			"EAP225(TP-Link|UN|AC1350-D):3.20\r\n"
++			"EAP225(TP-Link|UN|AC1350-D):4.0\r\n"
+ 			"EAP225(TP-Link|UN|AC1350-D):4.0 CA\r\n"
+ 			"EAP225-Outdoor(TP-Link|UN|AC1350-D):1.0\r\n"
++			"EAP225-Outdoor(TP-Link|UN|AC1350-D):3.0\r\n"
+ 			"EAP225-Outdoor(TP-Link|UN|AC1350-D):3.0 CA,JP\r\n",
+ 		.part_trail = PART_TRAIL_NONE,
+ 		.soft_ver = SOFT_VER_DEFAULT,
+-- 
+2.30.2
+
+diff --git a/tools/firmware-utils/patches/005-tplink-safeloader-fix-EAP225-Outdoor-model-IDs.patch b/tools/firmware-utils/patches/005-tplink-safeloader-fix-EAP225-Outdoor-model-IDs.patch
+new file mode 100644
+index 0000000000000000000000000000000000000000..6d2473d7ecdf2564c5db82ee89f59fb6e309b7fb
+--- /dev/null
+++ b/tools/firmware-utils/patches/005-tplink-safeloader-fix-EAP225-Outdoor-model-IDs.patch
+@@ -0,0 +1,37 @@
+From f7bdb17991043bf9ea14489f105437db31f772bd Mon Sep 17 00:00:00 2001
+From: Sander Vanheule <sander@svanheule.net>
+Date: Sun, 26 Jun 2022 16:43:07 +0200
+Subject: [PATCH 3/4] tplink-safeloader: fix EAP225-Outdoor model IDs
+
+The model IDs for EAP225-Outdoor v1 and EAP225-Outdoor v3 contain
+"AC1200". The corresponding identifiers grouped under EAP225-V3 contain
+"AC1350" however, which is a copy-paste error from the EAP225 v3/v3.2/v4
+IDs. Modify the strings in SupportList to actually match the ones on devices.
+
+Fixes: 9563fe8e78cb ("tplink-safeloader: add regionless EAP225-V3 IDs")
+Fixes: 365458e00ed7 ("tplink-safeloader: join EAP225-V3 compatible devices")
+Signed-off-by: Sander Vanheule <sander@svanheule.net>
+---
+ src/tplink-safeloader.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/tplink-safeloader.c b/src/tplink-safeloader.c
+index 3f58f95..c941159 100644
+--- a/src/tplink-safeloader.c
++++ b/src/tplink-safeloader.c
+@@ -1618,9 +1618,9 @@ static struct device_info boards[] = {
+ 			"EAP225(TP-Link|UN|AC1350-D):3.20\r\n"
+ 			"EAP225(TP-Link|UN|AC1350-D):4.0\r\n"
+ 			"EAP225(TP-Link|UN|AC1350-D):4.0 CA\r\n"
+-			"EAP225-Outdoor(TP-Link|UN|AC1350-D):1.0\r\n"
+-			"EAP225-Outdoor(TP-Link|UN|AC1350-D):3.0\r\n"
+-			"EAP225-Outdoor(TP-Link|UN|AC1350-D):3.0 CA,JP\r\n",
++			"EAP225-Outdoor(TP-Link|UN|AC1200-D):1.0\r\n"
++			"EAP225-Outdoor(TP-Link|UN|AC1200-D):3.0\r\n"
++			"EAP225-Outdoor(TP-Link|UN|AC1200-D):3.0 CA,JP\r\n",
+ 		.part_trail = PART_TRAIL_NONE,
+ 		.soft_ver = SOFT_VER_DEFAULT,
+ 		.soft_ver_compat_level = 1,
+-- 
+2.30.2
+
+diff --git a/tools/firmware-utils/patches/006-tplink-safeloader-drop-unqualified-EAP225-V3-IDs.patch b/tools/firmware-utils/patches/006-tplink-safeloader-drop-unqualified-EAP225-V3-IDs.patch
+new file mode 100644
+index 0000000000000000000000000000000000000000..f452087f3d504326509bc2bc664bced97d6776b5
+--- /dev/null
+++ b/tools/firmware-utils/patches/006-tplink-safeloader-drop-unqualified-EAP225-V3-IDs.patch
+@@ -0,0 +1,42 @@
+From 2c91e01e62eaa0ad4336a50cea03851bcf0fda10 Mon Sep 17 00:00:00 2001
+From: Sander Vanheule <sander@svanheule.net>
+Date: Mon, 27 Jun 2022 18:31:24 +0200
+Subject: [PATCH 4/4] tplink-safeloader: drop unqualified EAP225-V3 IDs
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+After adding the regionless identifiers in commit 9563fe8e78cb
+("tplink-safeloader: add regionless EAP225-V3 IDs"), the generated
+support-list partition exceeded the allocated space of 256 bytes. This
+resulted in the tool failing to generate factory images with the
+following warning:
+    support-list partition too big (more than 256 bytes): Success
+
+Although this message reports "Success", the tool actually fails with a
+return code of 1.
+
+This essentialy reverts commit 9563fe8e78cb, since the region-qualified
+IDs are also compatible with the non region-qualified devices. The
+change makes the generated support-list partition fit within the
+allocated space again.
+
+Tested-by: Andre Klärner <kandre@ak-online.be>
+Signed-off-by: Sander Vanheule <sander@svanheule.net>
+---
+ src/tplink-safeloader.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+--- a/src/tplink-safeloader.c
++++ b/src/tplink-safeloader.c
+@@ -1659,10 +1659,8 @@ static struct device_info boards[] = {
+ 			"SupportList:\r\n"
+ 			"EAP225(TP-Link|UN|AC1350-D):3.0\r\n"
+ 			"EAP225(TP-Link|UN|AC1350-D):3.20\r\n"
+-			"EAP225(TP-Link|UN|AC1350-D):4.0\r\n"
+ 			"EAP225(TP-Link|UN|AC1350-D):4.0 CA\r\n"
+ 			"EAP225-Outdoor(TP-Link|UN|AC1200-D):1.0\r\n"
+-			"EAP225-Outdoor(TP-Link|UN|AC1200-D):3.0\r\n"
+ 			"EAP225-Outdoor(TP-Link|UN|AC1200-D):3.0 CA,JP\r\n",
+ 		.part_trail = PART_TRAIL_NONE,
+ 		.soft_ver = SOFT_VER_DEFAULT,
--- a/patches/packages/gluon/0001-uradvd-adjust-preferred-lifetime-to-0.patch
+++ b/patches/packages/gluon/0001-uradvd-adjust-preferred-lifetime-to-0.patch
+From: Nico <github@nicoboehr.de>
+Date: Thu, 3 Jun 2021 20:31:55 +0000
+Subject: uradvd: adjust preferred lifetime to 0
+
+When we announce a prefix from nodes which has a preferred lifetime
+of nonzero, clients can use this prefix as a source IP address.
+
+As we announce the same prefix for every segment, this won't work. Hence,
+set the preferred lifetime to 0 so nobody ever uses it as a source IP.
+
+diff --git a/net/uradvd/src/uradvd.c b/net/uradvd/src/uradvd.c
+index f6549f249518714e3d9210708b54cc23d85b26df..0edcfdcc02c3c1d513413d8cb580880e4ef9eab6 100644
+--- a/net/uradvd/src/uradvd.c
+++ b/net/uradvd/src/uradvd.c
+@@ -62,7 +62,7 @@
+ 
+ /* These are in seconds */
+ #define AdvValidLifetime 86400u
+-#define AdvPreferredLifetime 14400u
+#define AdvPreferredLifetime 0u
+ #define AdvDefaultLifetime 0u
+ #define AdvCurHopLimit 64u
+ #define AdvRDNSSLifetime 1200u
--- a/patches/packages/packages/0002-fastd-remove-random-delay-on-inital-handshake.patch
+++ b/patches/packages/packages/0002-fastd-remove-random-delay-on-inital-handshake.patch
+From: Nico <github@nicoboehr.de>
+Date: Mon, 26 Apr 2021 14:12:43 +0000
+Subject: fastd: remove random delay on inital handshake
+
+When a peer limit is defined, fastd will by default randomly delay
+the inital handshake. As our gateways delay their handshake to
+better distribute their load, this is undesireable.
+
+diff --git a/net/fastd/patches/0100-remove-random-delay-on-inital-handshake.patch b/net/fastd/patches/0100-remove-random-delay-on-inital-handshake.patch
+new file mode 100644
+index 0000000000000000000000000000000000000000..40ca26812bda65d8b08a1034e23d1b2335c77259
+--- /dev/null
+++ b/net/fastd/patches/0100-remove-random-delay-on-inital-handshake.patch
+@@ -0,0 +1,23 @@
+--- a/src/peer.c
++++ b/src/peer.c
+@@ -322,19 +322,11 @@ static void reset_peer(fastd_peer_t *pee
+ 
+ /**
+    Starts the first handshake with a newly setup peer
+-
+-   If a peer group has a peer limit the handshakes will be delayed between 0 and 3 seconds
+-   make the choice of peers random (it will be biased by the latency, which might or might not be
+-   what a user wants)
+ */
+ static void init_handshake(fastd_peer_t *peer) {
+-	unsigned delay = 0;
+-	if (has_group_config_constraints(peer->group))
+-		delay = fastd_rand(0, 3000);
+-
+ 	peer->state = STATE_HANDSHAKE;
+ 
+-	fastd_peer_schedule_handshake(peer, delay);
++	fastd_peer_schedule_handshake(peer, 0);
+ }
+ 
+ /** Handles an asynchronous DNS resolve response */
--- a/targets/ath79-generic
+++ b/targets/ath79-generic
@@ -127,6 +127,13 @@ device('d-link-dir825b1', 'dlink_dir-825-b1', {
 	},
 })

+device('d-link-dir-825-rev-c1', 'dlink_dir-825-c1', {
+	factory = false,
+	manifest_aliases = {
+		'd-link-dir-825-rev-c1', -- Upgrade from OpenWrt 19.07
+	},
+})
+

 -- Enterasys

@@ -474,6 +481,10 @@ device('tp-link-eap225-outdoor-v1', 'tplink_eap225-outdoor-v1', {
 	packages = ATH10K_PACKAGES_QCA9888,
 })

+device('tp-link-eap225-outdoor-v3', 'tplink_eap225-outdoor-v3', {
+	packages = ATH10K_PACKAGES_QCA9888,
+})
+
 device('tp-link-re355-v1', 'tplink_re355-v1', {
 	manifest_aliases = {
 		'tp-link-re355', -- upgrade from OpenWrt 19.07
No results found