WIFI-14127: Update bdf for Edgecore EAP105

feeds/ipq807x_v5.4/hostapd/files/hostapd.sh

@@ -74,7 +74,7 @@ hostapd_append_wpa_key_mgmt() {
 			append wpa_key_mgmt "OWE"
 		;;
 		psk2-radius)
-			append wpa_key_mgmt "WPA-PSK-SHA256"
+			append wpa_key_mgmt "WPA-PSK"
 			[ "${ieee80211r:-0}" -gt 0 ] && append wpa_key_mgmt "FT-PSK"
 		;;
 	esac

feeds/ipq807x_v5.4/hostapd/files/mpskd

@@ -156,7 +156,9 @@ function netifd_reload() {
 				let vid = stacfg.vid;
 				if (vid)
 					keydata.vlan = +vid;
-
+				let mac = stacfg.mac;
+				if (mac)
+					keydata.mac = mac;
 				ssid.keys[key] = keydata;
 			}
 		}
@@ -201,12 +203,23 @@ function sta_cache_entry_add(ssid, addr, key) {
 	return cache_data;
 }
 
-function ssid_psk(ssid) {
+function ssid_psk(ssid, addr) {
 	ssid = ssids[ssid];
 	if (!ssid)
 		return [];
 
-	return keys(ssid.keys);
+	let specific = [];
+	let rest = [];
+	for (let k, v in ssid.keys)
+		if (v.mac == addr)
+			push(specific, k);
+		else if (!v.mac)
+			push(rest, k);
+
+	if (length(specific))
+		return specific;
+
+	return rest;
 }
 
 function sta_auth_psk(ifname, addr) {
@@ -218,7 +231,7 @@ function sta_auth_psk(ifname, addr) {
 	if (cache)
 		return [ cache.key ];
 
-	return ssid_psk(ssid);
+	return ssid_psk(ssid, addr);
 }
 
 function sta_auth_cache(ifname, addr, idx) {
@@ -230,7 +243,7 @@ function sta_auth_cache(ifname, addr, idx) {
 	if (cache)
 		return cache.data;
 
-	let psk = ssid_psk(ssid);
+	let psk = ssid_psk(ssid, addr);
 	if (!psk)
 		return;
 

feeds/ipq95xx/ipq53xx/base-files/etc/board.d/02_network

@@ -1,6 +1,8 @@
 #!/bin/sh
 
 . /lib/functions/uci-defaults.sh
+. /lib/functions.sh
+. /lib/functions/system.sh
 
 ipq53xx_setup_interfaces()
 {
@@ -20,9 +22,36 @@ ipq53xx_setup_interfaces()
 	esac
 }
 
+qcom_setup_macs()
+{
+        local board="$1"
+
+        case $board in
+        cig,wf189)
+                mtd=$(find_mtd_chardev "0:APPSBLENV")
+                [ -z "$mtd" ] && return;
+                mac=$(grep BaseMacAddress= $mtd | cut -dx -f2)
+                [ -z "$mac" ] && return;
+                wan_mac=$(macaddr_canonicalize $mac)
+                lan_mac=$(macaddr_add "$wan_mac" 1)
+                ucidef_set_network_device_mac eth0 $lan_mac
+                ucidef_set_network_device_mac eth1 $wan_mac
+                ucidef_set_label_macaddr $wan_mac
+                ;;
+        *)
+                wan_mac=$(cat /sys/class/net/eth1/address)
+                lan_mac=$(macaddr_add "$wan_mac" 1)
+                ;;
+        esac
+        [ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" $lan_mac
+        [ -n "$wan_mac" ] && ucidef_set_interface_macaddr "wan" $wan_mac
+        [ -n "$wan_mac" ] && ucidef_set_label_macaddr "$wan_mac"
+}
+
 board_config_update
 board=$(board_name)
 ipq53xx_setup_interfaces $board
+qcom_setup_macs $board
 board_config_flush
 
 exit 0

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:=edb452068069b97afe076a8b936f1e5edbbbbeb8635d8ccdd4d9570cbc78a875
+PKG_MIRROR_HASH:=8d13c000a08ae844f22e5e21a1f29f9bfa09951135187095ff8d34bf66f8c75b
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_DATE:=2024-07-03
-PKG_SOURCE_VERSION:=a62609706481e3b6496fd0a2aab643aa15a03c3c
+PKG_SOURCE_VERSION:=658a29d248b94cc65ebe2ed128c8554f9e264930
 PKG_MAINTAINER:=John Crispin <[email protected]>
 PKG_LICENSE:=BSD-3-Clause
 

feeds/ucentral/ucentral-state/files/ucentral-state

@@ -142,6 +142,9 @@ function blink_timeout() {
 		return;
 	blink_timer.cancel();
 	blink_timer = null;
+	if (current_state == 'blink') {
+		current_state = 'online';
+	}
 	system('/etc/init.d/led turnon');
 }