Merge Official Source

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>

package/network/services/dnsmasq/files/50-dnsmasq-migrate-resolv-conf-auto.sh

@@ -1,6 +1,9 @@
 #!/bin/sh
 
-uci -q get dhcp.@dnsmasq[0].mini_ttl >"/dev/null" && uci -q delete dhcp.@dnsmasq[0].mini_ttl
+uci -q get dhcp.@dnsmasq[0].mini_ttl >"/dev/null" && {
+	uci rename dhcp.@dnsmasq[0].mini_ttl="min_cache_ttl"
+	uci commit dhcp
+}
 
 [ "$(uci get dhcp.@dnsmasq[0].resolvfile)" = "/tmp/resolv.conf.auto" ] && {
 	uci set dhcp.@dnsmasq[0].resolvfile="/tmp/resolv.conf.d/resolv.conf.auto"

package/network/services/hostapd/files/hostapd.sh

@@ -77,7 +77,7 @@ hostapd_append_wpa_key_mgmt() {
 
 	[ "$fils" -gt 0 ] && {
 		case "$auth_type" in
-			eap-192)
+			eap192)
 				append wpa_key_mgmt FILS-SHA384
 				[ "${ieee80211r:-0}" -gt 0 ] && append wpa_key_mgmt FT-FILS-SHA384
 			;;

target/linux/realtek/image/rtl838x.mk

@@ -166,6 +166,7 @@ define Device/netgear_nge
   SOC := rtl8380
   IMAGE_SIZE := 14848k
   UIMAGE_MAGIC := 0x4e474520
+  UIMAGE_NAME := 9.9.9.9
   DEVICE_VENDOR := NETGEAR
 endef