From 45fa5d8aae290b6b60b3992f3c6d179ed20067a7 Mon Sep 17 00:00:00 2001
From: Sean Khan <datapronix@protonmail.com>
Date: Sat, 5 Oct 2024 14:50:44 -0400
Subject: [PATCH] ath11k_nss: Enhance nss_diag to properly list ifaces

Also optimized to use more native functions

Signed-off-by: Sean Khan <datapronix@protonmail.com>
---
 package/kernel/mac80211/files/nss_diag.sh | 116 ++++++++++------------
 1 file changed, 52 insertions(+), 64 deletions(-)

diff --git a/package/kernel/mac80211/files/nss_diag.sh b/package/kernel/mac80211/files/nss_diag.sh
index 674b6b3423..1868adda2e 100644
--- a/package/kernel/mac80211/files/nss_diag.sh
+++ b/package/kernel/mac80211/files/nss_diag.sh
@@ -1,92 +1,80 @@
 #!/bin/sh
-# shellcheck disable=3037,3060,2034,1091
+# shellcheck disable=3037,3060,2034,1091,2166
+
+blue=""
+red=""
+green=""
+yellow=""
+white=""
+reset=""
+bold=""
 
 # check if stdout is a terminal, then set colors.
-if test -t 1; then
-  fg=$(printf '\033[38;5;')
-  bg=$(printf '\033[48;5;')
-  red=$(printf '\033[31m')
-  green=$(printf '\033[32m')
-  yellow=$(printf '\033[33m')
-  blue=$(printf '\033[34m')
-  magenta=$(printf '\033[35m')
-  cyan=$(printf '\033[36m')
-  white=$(printf '\033[37m')
-  reset=$(printf '\033[m')
-  bold=$(printf '\033[1m')
-  underline=$(printf '\033[4m')
-  blink=$(printf '\033[5m')
-  invert=$(printf '\033[7m')
-  resetbold=$(printf '\033[21m')
-  resetunderline=$(printf '\033[24m')
-else
-  fg=""
-  bg=""
-  red=""
-  green=""
-  yellow=""
-  blue=""
-  magenta=""
-  cyan=""
-  white=""
-  reset=""
-  bold=""
-  underline=""
-  blink=""
-  invert=""
-  resetbold=""
-  resetunderline=""
+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"
 fi
 
+# Retrieve OpenWRT version
 [ -r /etc/openwrt_version ] && openwrt_rev=$(cat /etc/openwrt_version)
+
+# Retrieve device model
 model=$(jsonfilter -e ''@.model.name'' < /etc/board.json | sed -e "s/,/_/g")
 
 # NSS firmware version
 nss_fw="/lib/firmware/qca*.bin"
+# shellcheck disable=2086
 [ "$(ls $nss_fw 2> /dev/null)" ] && nss_version=$(grep -h -m 1 -a -o 'Version:.[^[:cntrl:]]*' $nss_fw | head -1 | cut -d ' ' -f 2)
 
 # ATH11K firmware version
-ath11k_fw=$(grep -h -m 1 -a -o 'WLAN.[^[:cntrl:]]*SILICONZ-1' /lib/firmware/*/q6* | head -1)
+ath11k_fw=$(grep -hm1 -a -o 'WLAN.[^[:cntrl:]]*SILICONZ-1' /lib/firmware/*/q6* | head -1)
 
 # MAC80211 (backports) version
 mac80211_version=$(awk '/version/{print $NF;exit}' /lib/modules/*/compat.ko)
 
-# OpenWRT IPQ
+# OpenWRT IPQ release details
 [ -r /etc/ipq_release ] && . /etc/ipq_release
 ipq_branch=${IPQ_BRANCH:-"N/A"}
 ipq_commit=${IPQ_COMMIT:-"N/A"}
 ipq_date=${IPQ_DATE:-"N/A"}
 
-[ -z "$openwrt_rev" ] && openwrt_rev="N/A"
-[ -z "$model" ] && model="N/A"
+# Defaults for empty variables
+openwrt_rev=${openwrt_rev:-"N/A"}
+model=${model:-"N/A"}
+nss_version=${nss_version:-"N/A"}
+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}  MAC80211${reset}: ${yellow}${mac80211_version}${reset}"
+echo -e "${bold}${red} ATH11K FW${reset}: ${green}${ath11k_fw}${reset}"
 
-[ -z "$nss_version" ] && nss_version="N/A"
-[ -z "$ath11k_fw" ] && ath11k_fw="N/A"
-[ -z "$mac80211_version" ] && mac80211_version="N/A"
-
-echo -e "${bold}${red}     MODEL${reset}: ${white}${model}${reset}"
-echo -e "${bold}${red}   OPENWRT${reset}: ${yellow}${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}: ${cyan}${nss_version}${reset}"
-echo -e "${bold}${red}  MAC80211${reset}: ${white}${mac80211_version}${reset}${reset}"
-echo -e "${bold}${red} ATH11K FW${reset}: ${cyan}${ath11k_fw}${reset}"
+# Display GRO Fragmentation status using BusyBox
 echo -ne "${bold}${red}  GRO FRAG${reset}: ${white}"
-
-count=0
-
-for i in wan br-lan /sys/class/net/br-lan/brif/*; do
-  i=${i##*\/}
-  ethtool -k ${i} | awk -v count=$count -v i=$i -v white=$white -v green=$green -v r=$reset '
-  /rx-gro-list/ {
-  if(count>0) tab="            "
-  color=red
-  if($2=="off") color=green
-  printf "%s%-11s : %s%s%s\n",tab,i,color,$2,r
-  }'
-  count=$((count + 1))
+n=0
+for iface in /sys/class/net/*; do
+  iface=${iface##*/}
+  [ "$iface" = "lo" -o "$iface" = "miireg" ] && continue
+  gro_status=$(ethtool -k "$iface" 2> /dev/null | awk '/rx-gro-list/{print $2}')
+  gro_status=${gro_status:-"N/A"}
+  color=$green
+  [ "$gro_status" = "on" ] && color=$red
+  [ $n -gt 0 ] && spacing="            "
+  printf "%s%-11s : %b%s%b\n" "$spacing" "$iface" "$color" "$gro_status" "$reset"
+  n=$((n + 1))
 done
 
 echo -e "${reset}"