From 4f5a3b0c2bf04e37eb4eaac49412a04ada14bb51 Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Mon, 25 Sep 2023 07:10:33 +0200
Subject: [PATCH] ucentral-schema: update to latest HEAD

Fixes: WIFI-12956
Signed-off-by: John Crispin <john@phrozen.org>
---
 feeds/ipq807x_v5.4/hostapd/files/hostapd.sh | 3 +++
 feeds/ucentral/ucentral-schema/Makefile     | 4 ++--
 feeds/wifi-ax/hostapd/files/hostapd.sh      | 4 +++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/feeds/ipq807x_v5.4/hostapd/files/hostapd.sh b/feeds/ipq807x_v5.4/hostapd/files/hostapd.sh
index 6311846d..e7fd7879 100644
--- a/feeds/ipq807x_v5.4/hostapd/files/hostapd.sh
+++ b/feeds/ipq807x_v5.4/hostapd/files/hostapd.sh
@@ -794,6 +794,9 @@ hostapd_set_bss_options() {
 			[ "$eapol_version" -ge "1" -a "$eapol_version" -le "2" ] && append bss_conf "eapol_version=$eapol_version" "$N"
 
 			set_default dynamic_vlan 0
+			[ "$macfilter" = radius ] && {
+				append_radius_server
+			}
 			vlan_possible=1
 			wps_possible=1
 		;;
diff --git a/feeds/ucentral/ucentral-schema/Makefile b/feeds/ucentral/ucentral-schema/Makefile
index 3c471ad7..0a0b5aeb 100644
--- a/feeds/ucentral/ucentral-schema/Makefile
+++ b/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:=62571bb529e8b350bafdc63db3d7e02effa3edf5e5f19bfe8ced96c7cfb08b0e
+PKG_MIRROR_HASH:=edb9bc0b8209226f585c724c88720eab2263c33eff6ebe2f2a5898896eb1fc11
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_DATE:=2022-05-29
-PKG_SOURCE_VERSION:=e99eaf9bdbbe68639b4632d7fec171d89c379dc5
+PKG_SOURCE_VERSION:=e9529eab9cae27f170bdb440eb60d7a0a2588cea
 
 PKG_MAINTAINER:=John Crispin <john@phrozen.org>
 PKG_LICENSE:=BSD-3-Clause
diff --git a/feeds/wifi-ax/hostapd/files/hostapd.sh b/feeds/wifi-ax/hostapd/files/hostapd.sh
index 62c937ee..d313ce0b 100644
--- a/feeds/wifi-ax/hostapd/files/hostapd.sh
+++ b/feeds/wifi-ax/hostapd/files/hostapd.sh
@@ -774,7 +774,6 @@ hostapd_set_bss_options() {
 			vlan_possible=1
 			[ "$macfilter" = radius ] && {
 				append_radius_server
-				vlan_possible=1
 			}
 		;;
 		psk|sae|psk-sae)
@@ -794,6 +793,9 @@ hostapd_set_bss_options() {
 			}
 			[ "$eapol_version" -ge "1" -a "$eapol_version" -le "2" ] && append bss_conf "eapol_version=$eapol_version" "$N"
 
+			[ "$macfilter" = radius ] && {
+				append_radius_server
+			}
 			set_default dynamic_vlan 0
 			vlan_possible=1
 			wps_possible=1