⛄ Sync 2026-11-01 05:43:29

luci-mod-status/htdocs/luci-static/resources/view/status/include/20_memory.js

@@ -31,9 +31,11 @@ return baseclass.extend({
 		var mem = L.isObject(systeminfo.memory) ? systeminfo.memory : {},
 		    swap = L.isObject(systeminfo.swap) ? systeminfo.swap : {};
 
-		var available = (mem.available != null) ? mem.available : mem.free;
+		// MemAvailable already accounts for reclaimable buffers and cache.
+		var available = (mem.available != null) ? mem.available :
+			(mem.free != null) ? mem.free + (mem.buffered || 0) : null;
 		if (available != null)
-			available = Math.min(mem.total ?? Infinity, Math.max(0, available + (mem.buffered || 0)));
+			available = Math.min(mem.total ?? Infinity, Math.max(0, available));
 
 		var fields = [
 			_('Used'), (mem.total && mem.available) ? (mem.total - available): null, mem.total,

luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js

@@ -166,10 +166,10 @@ function getRadioDisplayType(radio, iwinfoInfoMap) {
 	const hwname = info?.hardware?.name;
 	let name = radio.getI18n().replace(/^Generic | Wireless Controller .+$/g, '');
 
-	if (hwname && hwname != 'Generic Atheros')
+	if (hwname && !/^Generic(?:\s|$)/i.test(hwname))
 		name = hwname + (info.hwmodes_text ? ' 802.11' + info.hwmodes_text : '');
 
-	if (name && !/^unknown$/i.test(name) && !/^802\.11unknown$/i.test(name))
+	if (name && !/^(?:Generic(?:\s|$)|MAC80211(?:\s|$)|unknown$|802\.11unknown$)/i.test(name))
 		return name;
 
 	if (isQcaWifiHwtype(hwtype)) {