Merge pull request #959 from Telecominfraproject/main

merge for v4.1.1 Release

feeds/ucentral/ucentral-event/files/ucentral-event

@@ -275,23 +275,27 @@ handlers = {
 	},
 
 	vlan_add: function(notify) {
-		let vlan_id = `${notify.data.vlan_id}`;
-		vlan_refcount[vlan_id] = (vlan_refcount[vlan_id] || 0) + 1;
-
-		if (vlan_refcount[vlan_id] > 1) {
-			return;
-		}
-
 		if (config.config.swconfig)
 			return handlers.vlan_add_swconfig(notify);
 
-		for (let wan in wan_ports) {
+		let vlan_id = `${notify.data.vlan_id}`;
-			let msg = {
+		vlan_refcount[vlan_id] = (vlan_refcount[vlan_id] || 0) + 1;
-				name: wan,
+
-				vlan: [ `${notify.data.vlan_id}:t` ]
+		let parts = split(notify.data.ifname, '-v');
-			};
+		let is_wifi_iface = (length(parts) == 2 && wildcard(parts[0], 'wlan*'));
-			ubus.call('network.interface.up_none', 'add_device', msg);
+
-			ubus.call('udevstats', 'add_device', { device: wan, vlan: +notify.data.vlan_id });
+		if (vlan_refcount[vlan_id] > 1 && !is_wifi_iface)
+			return;
+
+		if (vlan_refcount[vlan_id] == 1) {
+			for (let wan in wan_ports) {
+				let msg = {
+					name: wan,
+					vlan: [ `${notify.data.vlan_id}:t` ]
+				};
+				ubus.call('network.interface.up_none', 'add_device', msg);
+				ubus.call('udevstats', 'add_device', { device: wan, vlan: +notify.data.vlan_id });
+			}
 		}
 
 		let msg = {
@@ -304,16 +308,16 @@ handlers = {
 	},
 
 	vlan_remove: function(notify) {
+		if (config.config.swconfig)
+			return;
+
 		let vlan_id = `${notify.data.vlan_id}`;
 		vlan_refcount[vlan_id] = (vlan_refcount[vlan_id] || 1) - 1;
 
-		if (vlan_refcount[vlan_id] > 0) {
+		if (vlan_refcount[vlan_id] > 0)
 			return;
-		}
 		delete vlan_refcount[vlan_id];
 
-		if (config.config.swconfig)
-			return;
 		for (let wan in wan_ports) {
 			let msg = {
 				name: wan,

feeds/ucentral/ucentral-schema/Makefile

@@ -4,10 +4,10 @@ PKG_NAME:=ucentral-schema
 PKG_RELEASE:=1
 
 PKG_SOURCE_URL=https://github.com/Telecominfraproject/wlan-ucentral-schema.git
-PKG_MIRROR_HASH:=83c6f6ae9898086f12cf6b3d611019ad024b1581533bdff1838180d3777ef7e1
+PKG_MIRROR_HASH:=92aba982ede40d6db5ab4b4847d578f4a7718e4db1ed757a412970c6e4e852e6
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_DATE:=2025-09-29
+PKG_SOURCE_DATE:=2025-10-09
-PKG_SOURCE_VERSION:=c7e15eb3406db6015fc3e9a86c116695552bb12b
+PKG_SOURCE_VERSION:=c836eb5cf446e7b2f8657b57b0518b83b0699411
 PKG_MAINTAINER:=John Crispin <john@phrozen.org>
 PKG_LICENSE:=BSD-3-Clause
 

feeds/ucentral/ucentral-schema/files/etc/ucentral/examples/multi-psk.json

@@ -1,17 +1,12 @@
 {
 	"uuid": 2,
 	"radios": [
-		{
-			"band": "6G",
-			"country": "CA",
-			"channel-mode": "HE",
-			"channel-width": 80
-		},
 		{
 			"band": "5G",
 			"country": "CA",
 			"channel-mode": "HE",
-			"channel-width": 80
+			"channel-width": 80,
+			"channel": 36
 		},
 		{
 			"band": "2G",
@@ -57,10 +52,7 @@
 							"key": "bbbbbbbb"
 						}
 					],
-					"roaming": {
+					"roaming": true
-						"message-exchange": "ds",
-						"generate-psk": true
-					}
 				}
 			]
 		},

profiles/cig_wf189.yml

@@ -17,4 +17,4 @@ packages:
   - sysstat
   - kmod-cig-poe-judgment
 diffconfig: |
-  CONFIG_KERNEL_IPQ_MEM_PROFILE=0 
+  CONFIG_KERNEL_IPQ_MEM_PROFILE=0

profiles/cig_wf189w.yml

@@ -16,4 +16,4 @@ packages:
   - sysstat
   - kmod-cig-poe-judgment
 diffconfig: |
-  CONFIG_KERNEL_IPQ_MEM_PROFILE=0 
+  CONFIG_KERNEL_IPQ_MEM_PROFILE=0