diff --git a/package/boot/uboot-tools/uboot-envtools/files/qualcommax_ipq50xx b/package/boot/uboot-tools/uboot-envtools/files/qualcommax_ipq50xx
index 6acc1431c1..8448cc0d33 100644
--- a/package/boot/uboot-tools/uboot-envtools/files/qualcommax_ipq50xx
+++ b/package/boot/uboot-tools/uboot-envtools/files/qualcommax_ipq50xx
@@ -27,7 +27,7 @@ linksys,mr5500|\
 linksys,mx2000|\
 linksys,mx5500|\
 linksys,spnmx56)
-	ubootenv_add_mtd "/dev/mtd$idx" "0x0" "0x40000" "0x20000"
+	ubootenv_add_mtd "u_env" "0x0" "0x40000" "0x20000"
 	;;
 jdcloud,re-cs-03)
 	ubootenv_add_mmc "0:APPSBLENV" "0x0" "0x40000" "0x20000"
diff --git a/package/kernel/mac80211/files/nss_diag.sh b/package/kernel/mac80211/files/nss_diag.sh
index 47d8c7b919..e1d592488d 100755
--- a/package/kernel/mac80211/files/nss_diag.sh
+++ b/package/kernel/mac80211/files/nss_diag.sh
@@ -3,17 +3,23 @@
 
 # check if stdout is a terminal, then set colors.
 if [ -t 1 ]; then
-  red="\033[31m"
-  green="\033[32m"
-  yellow="\033[33m"
-  blue="\033[34m"
-  magenta="\033[35m"
-  cyan="\033[36m"
-  white="\033[37m"
-  reset="\033[m"
-  bold="\033[1m"
+	red="\033[31m"
+	green="\033[32m"
+	yellow="\033[33m"
+	blue="\033[34m"
+	magenta="\033[35m"
+	cyan="\033[36m"
+	white="\033[37m"
+	reset="\033[m"
+	bold="\033[1m"
 fi
 
+# Retrieve Linux kernel
+kernel=$(uname -r)
+
+# Retrieve CPU freq mode
+cpu_mode=$(cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor)
+
 # Retrieve OpenWRT version
 [ -r /etc/openwrt_version ] && openwrt_rev=$(cat /etc/openwrt_version)
 
@@ -38,6 +44,8 @@ ipq_commit=${IPQ_COMMIT:-"N/A"}
 ipq_date=${IPQ_DATE:-"N/A"}
 
 # Defaults for empty variables
+kernel=${kernel:-"N/A"}
+cpu_mode=${cpu_mode:-"N/A"}
 openwrt_rev=${openwrt_rev:-"N/A"}
 model=${model:-"N/A"}
 nss_version=${nss_version:-"N/A"}
@@ -45,40 +53,42 @@ ath11k_fw=${ath11k_fw:-"N/A"}
 mac80211_version=${mac80211_version:-"N/A"}
 
 # Display the information
-echo -e "${bold}${red}     MODEL${reset}: ${blue}${bold}${model}${reset}"
-echo -e "${bold}${red}   OPENWRT${reset}: ${white}${openwrt_rev}${reset}"
-echo -e "${bold}${red}IPQ BRANCH${reset}: ${cyan}${ipq_branch}${reset}"
-echo -e "${bold}${red}IPQ COMMIT${reset}: ${cyan}${ipq_commit}${reset}"
-echo -e "${bold}${red}  IPQ DATE${reset}: ${cyan}${ipq_date}${reset}"
-echo -e "${bold}${red}    NSS FW${reset}: ${magenta}${nss_version}${reset}"
+echo -e "${bold}${red}     MODEL${reset}: ${cyan}${bold}${model}${reset}"
+echo -e "${bold}${red}    KERNEL${reset}: ${cyan}${bold}${kernel}${reset}"
+echo -e "${bold}${red}  CPU MODE${reset}: ${cyan}${bold}${cpu_mode}${reset}"
+echo -e "${bold}${red}   OPENWRT${reset}: ${green}${openwrt_rev}${reset}"
+echo -e "${bold}${red}IPQ BRANCH${reset}: ${green}${ipq_branch}${reset}"
+echo -e "${bold}${red}IPQ COMMIT${reset}: ${green}${ipq_commit}${reset}"
+echo -e "${bold}${red}  IPQ DATE${reset}: ${green}${ipq_date}${reset}"
+echo -e "${bold}${red}    NSS FW${reset}: ${yellow}${nss_version}${reset}"
 echo -e "${bold}${red}  MAC80211${reset}: ${yellow}${mac80211_version}${reset}"
-echo -e "${bold}${red} ATH11K FW${reset}: ${green}${ath11k_fw}${reset}"
+echo -e "${bold}${red} ATH11K FW${reset}: ${yellow}${ath11k_fw}${reset}"
 
 # Display GRO Fragmentation status using BusyBox
 echo -ne "${bold}${red} INTERFACE${reset}: ${white}"
 n=0
 for iface in /sys/class/net/br-lan/device /sys/class/net/*/device; do
-  iface=${iface%/*}
-  iface=${iface##*/}
-  ethtool -k "$iface" | awk -v n=$n -v i="$iface" -v rst="${reset}" -v red="${red}" -v green="${green}" '
-    BEGIN { settings=""; if(n>0) spacing="            " }
-    /tx-checksumming|rx-gro-list/ {
-      color=green
-      if($2=="off") color=red
-      settings = settings $1 " " sprintf("%s%-3s%s", color,$2,rst) " ";
-    }
-  END { printf "%s%-11s%s\n", spacing, i, settings; }'
-  n=$((n + 1))
+	iface=${iface%/*}
+	iface=${iface##*/}
+	ethtool -k "$iface" | awk -v n=$n -v i="$iface" -v rst="${reset}" -v red="${red}" -v green="${green}" '
+	BEGIN { settings=""; if(n>0) spacing="            " }
+	/tx-checksumming|rx-gro-list/ {
+		color=green
+		if($2=="off") color=red
+		settings = settings $1 " " sprintf("%s%-3s%s", color,$2,rst) " ";
+	}
+	END { printf "%s%-11s%s\n", spacing, i, settings; }'
+	n=$((n + 1))
 done
 
 echo -e "${reset}"
 echo -ne "${bold}${red}  NSS PKGS${reset}: ${white}"
 
 apk list -I | awk -v count=0 '
-  /kmod-qca|^nss/ {
-  if(count>0) tab="            "
-  print tab $1
-  count++
+	/kmod-qca|^nss/ {
+	if(count>0) tab="            "
+	print tab $1
+	count++
 }'
 
 echo -ne "${reset}"
diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6018-cp-cpu.dtsi b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6018-cp-cpu.dtsi
index 6f1683db37..f45ddd3675 100644
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6018-cp-cpu.dtsi
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6018-cp-cpu.dtsi
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 
-#include "ipq6018-cpr-regulator.dtsi"
 #include "ipq6018-mp5496.dtsi"
+#include "ipq6018-cpr-regulator.dtsi"
 
 &rpm {
 	status = "okay";
diff --git a/target/linux/qualcommax/ipq60xx/base-files/etc/board.d/02_network b/target/linux/qualcommax/ipq60xx/base-files/etc/board.d/02_network
index 6e059a7302..b86de490c6 100755
--- a/target/linux/qualcommax/ipq60xx/base-files/etc/board.d/02_network
+++ b/target/linux/qualcommax/ipq60xx/base-files/etc/board.d/02_network
@@ -56,9 +56,9 @@ ipq60xx_setup_macs()
 
 	case "$board" in
 	qihoo,360v6)
-		lan_mac=$(mtd_get_mac_ascii factory lanMac)
-		wan_mac=$(macaddr_add "$lan_mac" 1)
-		label_mac=$lan_mac
+		wan_mac=$(mtd_get_mac_ascii factory lanMac)
+		lan_mac=$(macaddr_add "$wan_mac" 1)
+		label_mac=$wan_mac
 		;;
 	tplink,eap610-outdoor)
 		lan_mac=$(get_mac_binary /tmp/factory_data/default-mac 0)
diff --git a/target/linux/qualcommax/ipq60xx/base-files/etc/hotplug.d/firmware/11-ath11k-caldata b/target/linux/qualcommax/ipq60xx/base-files/etc/hotplug.d/firmware/11-ath11k-caldata
old mode 100644
new mode 100755