mac80211/hostapd: more wifi bringup fixes

Signed-off-by: John Crispin <john@phrozen.org>

feeds/qca/hostapd/files/common.uc

@@ -213,9 +213,12 @@ const phy_proto = {
 		if (!base_mask)
 			return null;
 
+		if (base_mask == "00:00:00:00:00:00")
+			base_mask = "ff:ff:ff:ff:ff:ff";
+
 		if (data.macaddr_base)
 			base_addr = data.macaddr_base;
-		else if (base_mask == "00:00:00:00:00:00" &&
+		else if (base_mask == "ff:ff:ff:ff:ff:ff" &&
 		    (radio_idx > 0 || idx >= num_global)) {
 			let addrs = split(phy_sysfs_file(phy, "addresses"), "\n");
 
@@ -227,8 +230,6 @@ const phy_proto = {
 			} else {
 				if (idx < length(addrs))
 					return addrs[idx];
-
-				base_mask = "ff:ff:ff:ff:ff:ff";
 			}
 		}
 

feeds/qca/mac80211/files/etc/hotplug.d/ieee80211/10-wifi-detect

@@ -3,7 +3,8 @@
 . /lib/functions.sh
 
 iface_del() {
-        uci -p /etc/config-shadow/ delete wireless.$1
+        uci -c /etc/config-shadow/ delete wireless.$1
+        uci -c /etc/config-shadow/ commit
 }
 
 [ "${ACTION}" = "add" ] && {

feeds/ucentral/ucentral-schema/files/etc/ucentral/examples/roaming-psk2-radius.json

@@ -20,7 +20,7 @@
 		{
 			"name": "WAN",
 			"role": "upstream",
-			"services": [ "lldp" ],
+			"services": [ "ssh" ],
 			"ethernet": [
 				{
 					"select-ports": [
@@ -39,26 +39,11 @@
 					],
 					"bss-mode": "ap",
 					"encryption": {
-						"proto": "psk2-radius",
+						"proto": "psk2",
+						"key": "aaaaaaaa",
 						"ieee80211w": "optional"
 					},
-					"roaming": {
-						"message-exchange": "ds",
-						"key-aes-256": "000102030405060708090a0b0c0d0e0f000102030405060708090a0b0c0d0e0"
-					},
-					"radius": {
-						"authentication": {
-							"host": "192.168.178.9",
-							"port": 1812,
-							"secret": "testing123"
-						},
-						"accounting": {
-							"host": "192.168.178.9",
-							"port": 1813,
-							"secret": "testing123"
-						},
-						"nas-identifier": "OpenWifi"
-					}
+					"roaming": true
 				}
 			]
 		},
@@ -84,26 +69,7 @@
 			}
 		}
 	],
-	"metrics": {
-		"statistics": {
-			"interval": 120,
-			"types": [ "ssids", "lldp", "clients" ]
-		},
-		"health": {
-			"interval": 120
-		},
-		"wifi-frames": {
-			"filters": [
-				"assoc",
-				"disassoc"
-			]
-		}
-	},
 	"services": {
-		"lldp": {
-			"describe": "uCentral",
-			"location": "universe"
-		},
 		"ssh": {
 			"port": 22
 		}