docs/user/supported_devices.rst

@@ -9,6 +9,10 @@ ath79-generic
   - Fritz!WLAN Repeater 450E [#avmflash]_
   - Fritz!Box 4020 [#avmflash]_
 
+* Buffalo
+
+  - WZR-HP-AG300H / WZR-600DHP
+
 * devolo
 
   - WiFi pro 1200e [#lan_as_wan]_
@@ -90,6 +94,7 @@ ath79-generic
   - CPE510 (v1.0, v1.1)
   - CPE510 (v2.0)
   - CPE510 (v3.0)
+  - CPE710 (v1.0)
   - EAP225-Outdoor (v1)
   - TL-WDR3500 (v1)
   - TL-WDR3600 (v1)
@@ -103,6 +108,7 @@ ath79-generic
 * Ubiquiti
 
   - NanoBeam M5 (XW)
+  - NanoStation Loco M2 (XW)
   - NanoStation M2/M5 (XW)
   - UniFi AC Lite
   - UniFi AC LR
@@ -290,6 +296,10 @@ ramips-mt7621
 
   - RT-AC57U
 
+* Cudy
+
+  - WR2100
+
 * D-Link
 
   - DIR-860L (B1)
@@ -298,6 +308,8 @@ ramips-mt7621
 
   - EX6150 (v1)
   - R6220
+  - R6260
+  - WAC104
 
 * TP-Link
 

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=3cfe050c4a683ecef25d6ded05b1d240921a121a
+OPENWRT_COMMIT=76c5c95d94699d463d505056f858c7a23e4da79e
 
 PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git
 PACKAGES_PACKAGES_BRANCH=openwrt-22.03
-PACKAGES_PACKAGES_COMMIT=3aaf3324206582a488ebbea39b7a7bcf93b72368
+PACKAGES_PACKAGES_COMMIT=0e27c101bfb087c87db9198d9aed643f120f1739
 
 PACKAGES_ROUTING_REPO=https://github.com/openwrt/routing.git
 PACKAGES_ROUTING_BRANCH=openwrt-22.03

package/gluon-client-bridge/luasrc/lib/gluon/upgrade/320-gluon-client-bridge-wireless

@@ -90,21 +90,16 @@ local function configure_owe_transition_mode(config, radio_name)
 	local name_client = 'client_' .. radio_name
 	local name_owe = 'owe_' .. radio_name
 
-	local ssid_client = uci:get('wireless', name_client, 'ssid')
-	local ssid_owe = uci:get('wireless', name_owe, 'ssid')
+	local ifname_client = uci:get('wireless', name_client, 'ifname')
+	local ifname_owe = uci:get('wireless', name_owe, 'ifname')
 
-	local macaddr_client = uci:get('wireless', name_client, 'macaddr')
-	local macaddr_owe = uci:get('wireless', name_owe, 'macaddr')
-
-	if not (ssid_client and ssid_owe and macaddr_client and macaddr_owe) then
+	if not (ifname_client and ifname_owe) then
 		return
 	end
 
-	uci:set('wireless', name_client, 'owe_transition_ssid', ssid_owe)
-	uci:set('wireless', name_client, 'owe_transition_bssid', macaddr_owe)
+	uci:set('wireless', name_client, 'owe_transition_ifname', ifname_owe)
+	uci:set('wireless', name_owe, 'owe_transition_ifname', ifname_client)
 
-	uci:set('wireless', name_owe, 'owe_transition_ssid', ssid_client)
-	uci:set('wireless', name_owe, 'owe_transition_bssid', macaddr_client)
 	uci:set('wireless', name_owe, 'hidden', '1')
 end
 

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

@@ -67,6 +67,10 @@ elseif platform.match('lantiq') then
 			break
 		end
 	end
+elseif platform.match('ramips', 'mt7621', {
+	'netgear,wac104',
+}) then
+	lan_ifname, wan_ifname = 'lan2 lan3 lan4', 'lan1'
 end
 
 if wan_ifname and lan_ifname then

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

@@ -34,10 +34,12 @@ function M.is_outdoor_device()
 		'tplink,cpe510-v1',
 		'tplink,cpe510-v2',
 		'tplink,cpe510-v3',
+		'tplink,cpe710-v1',
 		'tplink,eap225-outdoor-v1',
 		'tplink,wbs210-v1',
 		'tplink,wbs210-v2',
 		'ubnt,nanobeam-m5-xw',
+		'ubnt,nanostation-loco-m-xw',
 		'ubnt,nanostation-m-xw',
 		'ubnt,unifi-ap-outdoor-plus',
 		'ubnt,unifiac-mesh',

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

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

targets/ath79-generic

@@ -26,6 +26,11 @@ device('avm-fritz-wlan-repeater-450e', 'avm_fritz450e', {
 	factory = false,
 })
 
+-- Buffalo
+
+device('buffalo-wzr-hp-ag300h', 'buffalo_wzr-hp-ag300h')
+device('buffalo-wzr-600dhp', 'buffalo_wzr-600dhp')
+
 -- devolo
 
 device('devolo-wifi-pro-1200e', 'devolo_dvl1200e', {
@@ -85,6 +90,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
 
@@ -381,6 +393,8 @@ device('tp-link-cpe510-v1', 'tplink_cpe510-v1', {
 device('tp-link-cpe510-v2', 'tplink_cpe510-v2')
 device('tp-link-cpe510-v3', 'tplink_cpe510-v3')
 
+device('tp-link-cpe710-v1', 'tplink_cpe710-v1')
+
 device('tp-link-eap225-outdoor-v1', 'tplink_eap225-outdoor-v1', {
 	packages = ATH10K_PACKAGES_QCA9888,
 })
@@ -424,6 +438,12 @@ device('tp-link-wbs210-v2', 'tplink_wbs210-v2')
 
 -- Ubiquiti
 
+device('ubiquiti-nanostation-loco-m-xw', 'ubnt_nanostation-loco-m-xw', {
+	manifest_aliases = {
+		'ubiquiti-nanostation-loco-m2-xw', -- upgrade from OpenWrt 19.07
+	},
+})
+
 device('ubiquiti-nanostation-m-xw', 'ubnt_nanostation-m-xw', {
 	manifest_aliases = {
 		'ubiquiti-nanostation-m2-xw', -- upgrade from OpenWrt 19.07

targets/ramips-mt7621

@@ -5,6 +5,13 @@ device('asus-rt-ac57u', 'asus_rt-ac57u', {
 })
 
 
+-- Cudy
+
+device('cudy-wr2100', 'cudy_wr2100', {
+        factory = false,
+})
+
+
 -- D-Link
 
 device('d-link-dir-860l-b1', 'dlink_dir-860l-b1')
@@ -20,6 +27,14 @@ device('netgear-r6220', 'netgear_r6220', {
 	factory_ext = '.img',
 })
 
+device('netgear-r6260', 'netgear_r6260', {
+	factory_ext = '.img',
+})
+
+device('netgear-wac104', 'netgear_wac104', {
+	factory_ext = '.img',
+})
+
 device('netgear-wndr3700-v5', 'netgear_wndr3700-v5', {
 	factory = false,
 	broken = true, -- untested