.github/filters.yml

@@ -205,16 +205,6 @@
     "targets/generic",
     "targets/targets.mk"
   ],
-  "realtek-rtl838x": [
-    "targets/realtek-rtl838x",
-    ".github/workflows/build-gluon.yml",
-    "modules",
-    "Makefile",
-    "patches/**",
-    "scripts/**",
-    "targets/generic",
-    "targets/targets.mk"
-  ],
   "rockchip-armv8": [
     "targets/rockchip-armv8",
     ".github/workflows/build-gluon.yml",

docs/user/supported_devices.rst

@@ -149,6 +149,10 @@ ath79-generic
 
 * Ubiquiti
 
+  - NanoBeam 5AC 19 (XC)
+  - NanoBeam M5 (XW)
+  - NanoStation Loco M2/M5 (XW)
+  - NanoStation M2/M5 (XW)
   - UniFi AC Lite
   - UniFi AC LR
   - UniFi AC Mesh
@@ -319,7 +323,7 @@ mediatek-filogic
 * Cudy
 
   - AP3000 Outdoor (v1)
-  - WR3000 (v1)
+  - WR3000 (v1, v2, v3)
 
 * D-Link
 
@@ -541,16 +545,9 @@ ramips-mt76x8
 * Xiaomi
 
   - Xiaomi Mi Router 4A (100M Edition)
-  - Xiaomi Mi Router 4A (100M International Edition)
+  - Xiaomi Mi Router 4A (100M International Edition v1, v2)
   - Xiaomi Mi Router 4C
 
-realtek-rtl838x
----------------
-
-* D-Link
-
-  - DGS-1210-10P (F1)
-
 rockchip-armv8
 --------------
 

package/gluon-core/luasrc/lib/gluon/upgrade/020-interfaces

@@ -50,6 +50,7 @@ if platform.match('ath79', 'generic', {
 	'tplink,wbs210-v1',
 	'tplink,wbs210-v2',
 	'tplink,wbs510-v1',
+	'ubnt,nanostation-m-xw',
 	'ubnt,unifi-ap-pro',
 }) then
 	lan_ifname, wan_ifname = wan_ifname, lan_ifname
@@ -83,10 +84,6 @@ elseif platform.match('lantiq', 'xrx200', {
 	'arcadyan,vgv7510kw22-nor',
 }) then
 	lan_ifname, wan_ifname = 'lan1 lan2 lan3 lan4', 'wan'
-elseif platform.match('realtek', 'rtl838x', {
-	'd-link,dgs-1210-10p',
-}) then
-	lan_ifname, wan_ifname = 'lan2 lan3 lan4 lan5 lan6 lan7 lan8 lan9 lan10', 'lan1'
 end
 
 if wan_ifname and lan_ifname then

package/gluon-core/luasrc/usr/lib/lua/gluon/platform.lua

@@ -41,6 +41,10 @@ function M.is_outdoor_device()
 		'tplink,wbs210-v1',
 		'tplink,wbs210-v2',
 		'tplink,wbs510-v1',
+		'ubnt,nanobeam-ac-xc',
+		'ubnt,nanobeam-m5-xw',
+		'ubnt,nanostation-loco-m-xw',
+		'ubnt,nanostation-m-xw',
 		'ubnt,uk-ultra',
 		'ubnt,unifi-ap-outdoor-plus',
 		'ubnt,unifiac-mesh',

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 */

patches/packages/packages/0003-uradvd-add-patch-to-announce-prefix-with-preferred-lifetime-0.patch

+From: Nico <github@nicoboehr.de>
+Date: Fri, 29 Dec 2023 23:17:27 +0000
+Subject: uradvd: add patch to announce prefix with preferred lifetime 0
+
+diff --git a/net/uradvd/patches/001-uradvd-announce-with-pref-0.patch b/net/uradvd/patches/001-uradvd-announce-with-pref-0.patch
+new file mode 100644
+index 0000000000000000000000000000000000000000..7882639d1bfec0923460c93f55fe9f44e58212c1
+--- /dev/null
++++ b/net/uradvd/patches/001-uradvd-announce-with-pref-0.patch
+@@ -0,0 +1,11 @@
++--- a/uradvd.c
+++++ b/uradvd.c
++@@ -43,7 +43,7 @@
++ 
++ /* These are in seconds */
++ #define AdvValidLifetime 86400u
++-#define AdvPreferredLifetime 14400u
+++#define AdvPreferredLifetime 0u
++ #define AdvDefaultLifetime 0u
++ #define AdvCurHopLimit 64u
++ #define AdvRDNSSLifetime 1200u

targets/ath79-generic

@@ -152,6 +152,13 @@ device('d-link-dir825b1', 'dlink_dir-825-b1', {
 	factory = false,
 })
 
+device('d-link-dir-825-c1', 'dlink_dir-825-c1', {
+	factory = false,
+	manifest_aliases = {
+		'd-link-dir-825-rev-c1', -- Upgrade from OpenWrt 19.07
+	},
+})
+
 
 -- Enterasys
 
@@ -523,6 +530,18 @@ device('tp-link-wbs510-v1', 'tplink_wbs510-v1')
 
 -- Ubiquiti
 
+device('ubiquiti-nanobeam-ac-gen1-xc', 'ubnt_nanobeam-ac-xc', {
+	packages = ATH10K_PACKAGES_QCA9880,
+})
+
+device('ubiquiti-nanostation-loco-m-xw', 'ubnt_nanostation-loco-m-xw', {
+	aliases = {
+		'ubiquiti-nanobeam-m5-xw',
+	},
+})
+
+device('ubiquiti-nanostation-m-xw', 'ubnt_nanostation-m-xw')
+
 device('ubiquiti-unifi-ac-lite', 'ubnt_unifiac-lite', {
 	factory = false,
 	packages = ATH10K_PACKAGES_QCA9880,

targets/ramips-mt7621

@@ -19,6 +19,14 @@ device('cudy-wr1300-v1', 'cudy_wr1300-v1', {
 	},
 })
 
+device('cudy-wr1300-v2', 'cudy_wr1300-v2', {
+	factory = false,
+})
+
+device('cudy-wr1300-v3', 'cudy_wr1300-v3', {
+	factory = false,
+})
+
 device('cudy-wr2100', 'cudy_wr2100', {
 	factory = false,
 })
@@ -175,3 +183,17 @@ device('zyxel-wsm20', 'zyxel_wsm20', {
 	factory = false,
 })
 
+
+-- Devices without WLAN
+
+-- Ubiquiti
+
+device('ubiquiti-edgerouter-x', 'ubnt_edgerouter-x', {
+	factory = false,
+	packages = {'-hostapd-mini'},
+})
+
+device('ubiquiti-edgerouter-x-sfp', 'ubnt_edgerouter-x-sfp', {
+	factory = false,
+	packages = {'-hostapd-mini'},
+})

targets/ramips-mt76x8

@@ -124,6 +124,10 @@ device('xiaomi-mi-router-4a-100m-international-edition', 'xiaomi_mi-router-4a-10
 	factory = false,
 })
 
+device('xiaomi-mi-router-4a-100m-international-edition-v2', 'xiaomi_mi-router-4a-100m-intl-v2', {
+	factory = false,
+})
+
 device('xiaomi-mi-router-4c', 'xiaomi_mi-router-4c', {
 	factory = false,
 })

targets/realtek-rtl838x

--- D-Link
-
-device('d-link_dgs-1210-10p', 'd-link_dgs-1210-10p', {
-	factory = '-squashfs-factory_image1',
-})

targets/targets.mk

@@ -18,7 +18,6 @@ $(eval $(call GluonTarget,mpc85xx,p1020))
 $(eval $(call GluonTarget,ramips,mt7620))
 $(eval $(call GluonTarget,ramips,mt7621))
 $(eval $(call GluonTarget,ramips,mt76x8))
-$(eval $(call GluonTarget,realtek,rtl838x))
 $(eval $(call GluonTarget,rockchip,armv8))
 $(eval $(call GluonTarget,sunxi,cortexa7))
 $(eval $(call GluonTarget,x86,generic))