mac80211: scan: Decrease passive scan channel time in sw_scan

Allow configuring small values of duration time for passive
scanning in software scan.

Fixes: WIFI-14822

Signed-off-by: Marek Kwaczynski <marek@shasta.cloud>

feeds/mediatek-sdk/mac80211/patches/subsys/mtk-9905-mac80211-decrease-passive-scan-chan-time.patch

@@ -0,0 +1,34 @@
+Index: backports-5.15.81-1/net/mac80211/scan.c
+===================================================================
+--- backports-5.15.81-1.orig/net/mac80211/scan.c
++++ backports-5.15.81-1/net/mac80211/scan.c
+@@ -29,6 +29,9 @@
+ #define IEEE80211_CHANNEL_TIME (HZ / 33)
+ #define IEEE80211_PASSIVE_CHANNEL_TIME (HZ / 9)
+ 
++/* Additional time used for passive SW scaning */
++#define IEEE80211_PASSIVE_MIN_CHANNEL_TIME (HZ / 13)
++
+ void ieee80211_rx_bss_put(struct ieee80211_local *local,
+ 			  struct ieee80211_bss *bss)
+ {
+@@ -1014,10 +1017,15 @@ set_channel:
+ 	 */
+ 	if ((chan->flags & (IEEE80211_CHAN_NO_IR | IEEE80211_CHAN_RADAR)) ||
+ 	    !scan_req->n_ssids) {
+-		*next_delay = msecs_to_jiffies(scan_req->duration) >
+-			      IEEE80211_PASSIVE_CHANNEL_TIME ?
+-			      msecs_to_jiffies(scan_req->duration) :
+-			      IEEE80211_PASSIVE_CHANNEL_TIME;
++		if (msecs_to_jiffies(scan_req->duration) > IEEE80211_PASSIVE_CHANNEL_TIME) {
++			*next_delay = msecs_to_jiffies(scan_req->duration);
++		} else if (scan_req->duration > 0) {
++			*next_delay = scan_req->duration > IEEE80211_PASSIVE_MIN_CHANNEL_TIME ?
++				msecs_to_jiffies(scan_req->duration - IEEE80211_PASSIVE_MIN_CHANNEL_TIME) :
++				0;
++		} else {
++			*next_delay = IEEE80211_PASSIVE_CHANNEL_TIME;
++		}
+ 		local->next_scan_state = SCAN_DECISION;
+ 		if (scan_req->n_ssids)
+ 			set_bit(SCAN_BEACON_WAIT, &local->scanning);

feeds/ucentral/ucentral-client/files/etc/ucentral/version.json

@@ -1,5 +1,5 @@
 {
 	"major": 4,
 	"minor": 1,
-	"patch": 1
+	"patch": 0
 }

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

@@ -275,27 +275,23 @@ handlers = {
 	},
 
 	vlan_add: function(notify) {
-		if (config.config.swconfig)
-			return handlers.vlan_add_swconfig(notify);
-
 		let vlan_id = `${notify.data.vlan_id}`;
 		vlan_refcount[vlan_id] = (vlan_refcount[vlan_id] || 0) + 1;
 
-		let parts = split(notify.data.ifname, '-v');
-		let is_wifi_iface = (length(parts) == 2 && wildcard(parts[0], 'wlan*'));
-
-		if (vlan_refcount[vlan_id] > 1 && !is_wifi_iface)
+		if (vlan_refcount[vlan_id] > 1) {
 			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 });
-			}
+		if (config.config.swconfig)
+			return handlers.vlan_add_swconfig(notify);
+
+		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 = {
@@ -308,16 +304,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:=c0f43db0530a38eb424e81908ad47a14e1d4d8f8a86eb148e34f98187c79ba6b
+PKG_MIRROR_HASH:=f72d2e5b01ecb7a488d50d860da63664d992e50c7e046fed866be6733bab3c1c
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_DATE:=2025-10-16
-PKG_SOURCE_VERSION:=dc9cad95641266a08de73aab85d931d992090159
+PKG_SOURCE_DATE:=2025-09-29
+PKG_SOURCE_VERSION:=676e1550c53b7d48a54aa759f65d341168627c5e
 PKG_MAINTAINER:=John Crispin <john@phrozen.org>
 PKG_LICENSE:=BSD-3-Clause
 

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

@@ -1,12 +1,17 @@
 {
 	"uuid": 2,
 	"radios": [
+		{
+			"band": "6G",
+			"country": "CA",
+			"channel-mode": "HE",
+			"channel-width": 80
+		},
 		{
 			"band": "5G",
 			"country": "CA",
 			"channel-mode": "HE",
-			"channel-width": 80,
-			"channel": 36
+			"channel-width": 80
 		},
 		{
 			"band": "2G",
@@ -52,7 +57,10 @@
 							"key": "bbbbbbbb"
 						}
 					],
-					"roaming": true
+					"roaming": {
+						"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