diff --git a/snmp/Openwrt/README.md b/snmp/Openwrt/README.md
new file mode 100644
index 000000000..40a4dad1b
--- /dev/null
+++ b/snmp/Openwrt/README.md
@@ -0,0 +1,96 @@
+# OpenWrt wireless + sensors SNMP agent
+
+These scripts expose per-radio and aggregate wireless metrics (plus lm-sensors
+temperatures) to LibreNMS through net-snmp `pass_persist` handlers. Radios and
+VAPs are discovered live at request time, so there is no per-interface or
+per-metric snmpd configuration to maintain. See
+[Device-Notes/Openwrt.md](https://docs.librenms.org/Support/Device-Notes/#openwrt)
+for the LibreNMS-side install and discovery steps.
+
+## Scripts
+
+| Script | Purpose |
+| --- | --- |
+| `openwrt-snmp-pass.sh` | Wireless `pass_persist` handler. Serves the OpenWrt wireless subtree (OPENWRT-WIRELESS-MIB, `.1.3.6.1.4.1.60652.102.1.10`) from a single snmpd line. |
+| `lm-sensors-pass.sh` | Temperature `pass_persist` handler (LM-SENSORS-MIB emulation). |
+| `wlInterfaces.sh` | Interface/label inventory. Helper used by `openwrt-snmp-pass.sh`. |
+| `wlClients.sh [iface]` | Client counts (per interface, or aggregate). Helper. |
+| `wlFrequency.sh <iface>` | Channel frequency (MHz). Helper. |
+| `wlNoiseFloor.sh <iface>` | Noise floor (dBm). Helper. |
+| `wlRate.sh <iface> <tx\|rx> <min\|avg\|max>` | TX/RX rate (Mbit/s). Helper. |
+| `wlSNR.sh <iface> <min\|avg\|max>` | SNR (dB). Helper. |
+
+The `wl*.sh` scripts are collection helpers invoked by `openwrt-snmp-pass.sh`;
+they are not registered with snmpd directly. They can be run standalone for
+debugging.
+
+## snmpd configuration
+
+Copy the scripts to a directory on the device (the helpers must sit next to
+`openwrt-snmp-pass.sh`, which calls them by relative path):
+
+```sh
+mkdir -p /usr/libexec/openwrt-snmp
+for s in openwrt-snmp-pass lm-sensors-pass wlInterfaces wlClients \
+         wlFrequency wlNoiseFloor wlRate wlSNR; do
+  wget -O "/usr/libexec/openwrt-snmp/$s.sh" \
+    "https://raw.githubusercontent.com/librenms/librenms-agent/master/snmp/Openwrt/$s.sh"
+done
+chmod +x /usr/libexec/openwrt-snmp/*.sh
+```
+
+Register the two handlers in `/etc/config/snmpd`:
+
+```
+config pass
+	option miboid '.1.3.6.1.4.1.60652.102.1.10'
+	option prog '/usr/libexec/openwrt-snmp/openwrt-snmp-pass.sh'
+	option persist '1'
+
+config pass
+	option miboid '.1.3.6.1.4.1.2021.13.16.2.1'
+	option prog '/usr/libexec/openwrt-snmp/lm-sensors-pass.sh'
+	option persist '1'
+```
+
+OS detection additionally reads a `distro` and a `hardware` extend
+(`nsExtendOutput1Line."distro"` / `."hardware"`); these use small inline
+commands rather than shipped scripts:
+
+```
+config extend
+	option name 'distro'
+	option prog '/bin/sh'
+	option args '-c '\''. /etc/os-release; echo $PRETTY_NAME'\'''
+
+config extend
+	option name 'hardware'
+	option prog '/bin/cat'
+	option args '/tmp/sysinfo/model'
+```
+
+(`/tmp/sysinfo/model` is OpenWrt's board-detection model string; it works on all
+targets including x86, unlike `/sys/firmware/devicetree/base/model`.)
+
+Restart snmpd:
+
+```sh
+/etc/init.d/snmpd restart
+```
+
+## Validation
+
+From the LibreNMS host, walk the wireless subtree and the temperature table:
+
+```sh
+snmpwalk -v2c -c your_community_string <openwrt-host> .1.3.6.1.4.1.60652.102.1.10
+snmpwalk -v2c -c your_community_string <openwrt-host> .1.3.6.1.4.1.2021.13.16
+```
+
+On the device, the handler can be exercised directly:
+
+```sh
+/usr/libexec/openwrt-snmp/openwrt-snmp-pass.sh --snapshot        # full OID table
+/usr/libexec/openwrt-snmp/openwrt-snmp-pass.sh -g <oid>          # single GET
+/usr/libexec/openwrt-snmp/openwrt-snmp-pass.sh -n <oid>          # GETNEXT
+```
diff --git a/snmp/Openwrt/lm-sensors-pass.sh b/snmp/Openwrt/lm-sensors-pass.sh
new file mode 100755
index 000000000..94255be77
--- /dev/null
+++ b/snmp/Openwrt/lm-sensors-pass.sh
@@ -0,0 +1,130 @@
+#!/bin/sh
+
+# lm-sensors-pass.sh
+# SNMP pass script for LM-SENSORS-MIB thermal sensors
+# Provides proper MIB structure at .1.3.6.1.4.1.2021.13.16.2.1
+
+BASE_OID=".1.3.6.1.4.1.2021.13.16.2.1"
+
+# Function to get all thermal zone data
+# Output format: index:name:temp
+# Re-indexes zones sequentially starting from 1
+get_zones() {
+    idx=0
+    for zone in /sys/devices/virtual/thermal/thermal_zone*; do
+        [ -d "$zone" ] || continue
+        idx=$((idx + 1))
+        zone_type=$(cat "$zone/type" 2>/dev/null || echo "unknown")
+        zone_temp=$(cat "$zone/temp" 2>/dev/null || echo "0")
+        echo "$idx:$zone_type:$zone_temp"
+    done | sort -t':' -k1 -n
+}
+
+case "$1" in
+    -g)
+        # GET request - return exact OID match
+        REQ_OID="$2"
+        FOUND=0
+
+        while IFS=':' read -r idx name temp; do
+            case "$REQ_OID" in
+                "$BASE_OID.1.$idx")
+                    echo "$REQ_OID"
+                    echo "integer"
+                    echo "$idx"
+                    FOUND=1
+                    break
+                    ;;
+                "$BASE_OID.2.$idx")
+                    echo "$REQ_OID"
+                    echo "string"
+                    echo "$name"
+                    FOUND=1
+                    break
+                    ;;
+                "$BASE_OID.3.$idx")
+                    echo "$REQ_OID"
+                    echo "gauge"
+                    echo "$temp"
+                    FOUND=1
+                    break
+                    ;;
+            esac
+        done << EOF
+$(get_zones)
+EOF
+
+        [ "$FOUND" -eq 0 ] && echo "NONE"
+        ;;
+
+    -n)
+        # GETNEXT request - return next OID after requested
+        REQ_OID="$2"
+
+        # Create temporary file with all OIDs
+        TMP_FILE="$(mktemp /tmp/snmp_oids.XXXXXX 2>/dev/null || echo "/tmp/snmp_oids.$$")"
+        TMP_SORTED="${TMP_FILE}.sorted"
+        TMP_LIST="${TMP_FILE}.list"
+        : > "$TMP_FILE"
+        trap 'rm -f "$TMP_FILE" "$TMP_SORTED" "$TMP_LIST"' EXIT INT TERM
+
+        get_zones | while IFS=':' read -r idx name temp; do
+            # Pad index to ensure proper numeric sorting
+            # Format: column.index where index is zero-padded to 3 digits
+            {
+                printf '%d.%03d|%s.1.%s|integer|%s\n' 1 "$idx" "$BASE_OID" "$idx" "$idx"
+                printf '%d.%03d|%s.2.%s|string|%s\n' 2 "$idx" "$BASE_OID" "$idx" "$name"
+                printf '%d.%03d|%s.3.%s|gauge|%s\n' 3 "$idx" "$BASE_OID" "$idx" "$temp"
+            } >> "$TMP_FILE"
+        done
+
+        # Sort by our padded key, then extract and compare OIDs
+        sort -t'|' -k1 "$TMP_FILE" > "$TMP_SORTED"
+        cut -d'|' -f2- "$TMP_SORTED" > "$TMP_LIST"
+
+        FOUND=0
+        while IFS='|' read -r oid type value; do
+            # Use awk for proper numeric OID comparison
+            is_greater=$(awk -v req="$REQ_OID" -v curr="$oid" '
+                BEGIN {
+                    # Split OIDs into arrays
+                    req_len = split(req, req_parts, ".");
+                    curr_len = split(curr, curr_parts, ".");
+                    max_len = (curr_len > req_len) ? curr_len : req_len;
+
+                    # Compare each part numerically
+                    for (i = 1; i <= max_len; i++) {
+                        req_val = (i <= req_len) ? req_parts[i] : 0;
+                        curr_val = (i <= curr_len) ? curr_parts[i] : 0;
+
+                        if (curr_val > req_val) {
+                            print "1";
+                            exit;
+                        } else if (curr_val < req_val) {
+                            print "0";
+                            exit;
+                        }
+                    }
+                    print "0";
+                }
+            ')
+
+            if [ "$is_greater" = "1" ]; then
+                echo "$oid"
+                echo "$type"
+                echo "$value"
+                FOUND=1
+                break
+            fi
+        done < "$TMP_LIST"
+
+        if [ "$FOUND" -eq 0 ]; then
+            echo "NONE"
+        fi
+        ;;
+
+    *)
+        echo "Usage: $0 -g|-n OID" >&2
+        exit 1
+        ;;
+esac
diff --git a/snmp/Openwrt/openwrt-snmp-pass.sh b/snmp/Openwrt/openwrt-snmp-pass.sh
new file mode 100755
index 000000000..8b91642d2
--- /dev/null
+++ b/snmp/Openwrt/openwrt-snmp-pass.sh
@@ -0,0 +1,388 @@
+#!/bin/sh
+#
+# openwrt-snmp-pass.sh
+#
+# net-snmp pass_persist handler that serves the OpenWrt wireless subtree
+# openwrtWireless = OPENWRT-WIRELESS-MIB { openwrtObjects 10 } from a SINGLE snmpd line
+# (UCI: config pass / option miboid / option persist '1'):
+#
+#   pass_persist .1.3.6.1.4.1.60652.102.1.10 /usr/libexec/openwrt-snmp/openwrt-snmp-pass.sh
+#
+# Radios/VAPs are discovered live at request time (no per-interface or
+# per-metric configuration). Rows are indexed by the kernel ifIndex, so the
+# table joins onto IF-MIB ifTable/ifXTable.
+#
+# Object layout (relative to the wireless base .102.1.10):
+#   .1.0                         openwrtWirelessInterfaceCount   (gauge)
+#   .2.0                         openwrtWirelessClientCount      (gauge, AP-side)
+#   .3.1.<col>.<ifIndex>         openwrtWirelessInterfaceTable columns:
+#       col 2  Name        string     col10  RxRateMin    gauge
+#       col 3  Label       string     col11  RxRateAvg    gauge
+#       col 4  Clients     gauge      col12  RxRateMax    gauge
+#       col 5  Frequency   gauge      col13  SnrMin       integer
+#       col 6  NoiseFloor  integer    col14  SnrAvg       integer
+#       col 7  TxRateMin   gauge      col15  SnrMax       integer
+#       col 8  TxRateAvg   gauge      col16  ChannelUtil  gauge   (percent)
+#       col 9  TxRateMax   gauge      col17  TxPower      integer (dBm)
+#   (col 1, openwrtWlIfaceIfIndex, is the not-accessible table index.)
+#
+# Modes:
+#   pass_persist (default): read PING/get/getnext on stdin (snmpd uses this).
+#   one-shot for testing:   openwrt-snmp-pass.sh -g <OID>
+#                           openwrt-snmp-pass.sh -n <OID>
+#
+# Testing without a device: set OPENWRT_WL_MOCK=<file> to a TSV of pre-built
+# interface records (see collect_records() for the field order); the metric
+# collectors and iwinfo are then bypassed.
+
+BASE=".1.3.6.1.4.1.60652.102"
+WL="$BASE.1.10"       # openwrtWireless = { openwrtObjects 10 }
+IFCOUNT_OID="$WL.1.0"
+CLIENTS_OID="$WL.2.0"
+ENTRY="$WL.3.1"
+
+# Snapshot cache TTL (seconds). A single SNMP walk issues many getnext calls;
+# caching avoids re-running iwinfo/iw for every OID in the walk.
+TTL="${OPENWRT_WL_TTL:-20}"
+
+SCRIPTDIR=$(cd "$(dirname "$0")" 2>/dev/null && pwd || echo .)
+TAB=$(printf '\t')
+
+SNAP_FILE="/tmp/openwrt-snmp-pass.$$.snap"
+SNAP_TS=0
+trap 'rm -f "$SNAP_FILE"' EXIT INT TERM
+
+now() { date +%s 2>/dev/null || echo 0; }
+
+# --------------------------------------------------------------------------
+# Data collection
+# --------------------------------------------------------------------------
+# collect_records: one tab-separated record per wireless interface, fields:
+#   1 ifIndex   2 name    3 label    4 clients  5 freqMHz  6 noiseDbm
+#   7 txMin  8 txAvg  9 txMax  10 rxMin 11 rxAvg 12 rxMax
+#   13 snrMin 14 snrAvg 15 snrMax
+# Interfaces without a readable /sys ifindex are skipped (cannot be indexed).
+
+sanitize_int() {
+    # First signed integer token, decimals truncated; default 0.
+    printf '%s' "$1" | awk '
+        { if (match($0, /-?[0-9]+/)) print substr($0, RSTART, RLENGTH) + 0; else print 0; exit }
+        END { if (NR == 0) print 0 }'
+}
+
+# Helper command paths (overridable for testing).
+WLIFACES="${OPENWRT_WL_IFACES_CMD:-$SCRIPTDIR/wlInterfaces.sh}"
+WLCLIENTS="${OPENWRT_WL_CLIENTS_CMD:-$SCRIPTDIR/wlClients.sh}"
+
+to_lower() { printf '%s' "$1" | tr 'A-Z' 'a-z'; }
+
+iface_ifindex() {
+    if [ -n "${OPENWRT_WL_IFINDEX_MAP:-}" ]; then
+        awk -v k="$1" '$1==k {print $2; exit}' "$OPENWRT_WL_IFINDEX_MAP"
+        return
+    fi
+    cat "/sys/class/net/$1/ifindex" 2>/dev/null
+}
+
+iface_associated() {
+    # For client/STA interfaces with an empty assoc list: 1 when associated, else 0.
+    ap=$(iwinfo "$1" info 2>/dev/null | sed -n 's/.*Access Point:[[:space:]]*\([^ ]\+\).*/\1/p' | head -1)
+    case "$ap" in
+        ''|Not-Associated|00:00:00:00:00:00) echo 0 ;;
+        *) echo 1 ;;
+    esac
+}
+
+# --------------------------------------------------------------------------
+# Per-interface metric collection. ubus-first (the OpenWrt-native, structured
+# path) with an iwinfo-CLI fallback. Both emit the SAME tagged block so a single
+# aggregator handles either source. This replaces the previous ~15 iwinfo/iw
+# invocations per interface (which risked exceeding snmpd's pass timeout on a
+# cold cache) with one ubus call-set (or two iwinfo CLI calls) per interface.
+#
+# Tagged block (line order irrelevant):
+#   MODE <s>  FREQ <mhz>  NOISE <dbm>  ASSOC <n>
+#   RX <mbit>   TX <mbit>   SNR <db>      (one set per associated station)
+# --------------------------------------------------------------------------
+
+stats_via_ubus() {
+    _if="$1"
+    command -v ubus >/dev/null 2>&1 || return 1
+    command -v jsonfilter >/dev/null 2>&1 || return 1
+    ubus list iwinfo >/dev/null 2>&1 || return 1
+
+    _info=$(ubus call iwinfo info "{\"device\":\"$_if\"}" 2>/dev/null)
+    _assoc=$(ubus call iwinfo assoclist "{\"device\":\"$_if\"}" 2>/dev/null)
+    [ -n "$_info$_assoc" ] || return 1
+
+    printf 'MODE %s\n'    "$(printf '%s' "$_info" | jsonfilter -e '@.mode' 2>/dev/null)"
+    printf 'FREQ %s\n'    "$(printf '%s' "$_info" | jsonfilter -e '@.frequency' 2>/dev/null)"
+    printf 'NOISE %s\n'   "$(printf '%s' "$_info" | jsonfilter -e '@.noise' 2>/dev/null)"
+    printf 'TXPOWER %s\n' "$(printf '%s' "$_info" | jsonfilter -e '@.txpower' 2>/dev/null)"
+
+    # Associated-station count from a field that always exists per station
+    # (iwinfo's assoclist JSON has no top-level "snr").
+    printf 'ASSOC %s\n' "$(printf '%s' "$_assoc" | jsonfilter -e '@.results[*].signal' 2>/dev/null | awk 'NF' | wc -l | awk '{print $1}')"
+    # iwinfo ubus rates are kbit/s -> Mbit/s.
+    printf '%s' "$_assoc" | jsonfilter -e '@.results[*].rx.rate' 2>/dev/null | awk 'NF{printf "RX %d\n", $1/1000}'
+    printf '%s' "$_assoc" | jsonfilter -e '@.results[*].tx.rate' 2>/dev/null | awk 'NF{printf "TX %d\n", $1/1000}'
+    # No "snr" field in the JSON: compute SNR = per-station signal - noise,
+    # pairing the two arrays by index. Skip stations whose noise floor is
+    # unavailable (0), e.g. radios that do not report survey noise.
+    { printf '%s' "$_assoc" | jsonfilter -e '@.results[*].signal' 2>/dev/null | sed 's/^/S /'
+      printf '%s' "$_assoc" | jsonfilter -e '@.results[*].noise'  2>/dev/null | sed 's/^/N /'
+    } | awk '
+        $1=="S" { s[++a]=$2 }
+        $1=="N" { n[++b]=$2 }
+        END { for (i=1; i<=a; i++) if (n[i]+0 != 0) printf "SNR %d\n", s[i]-n[i] }'
+    return 0
+}
+
+stats_via_cli() {
+    _if="$1"
+    command -v iwinfo >/dev/null 2>&1 || return 1
+    _info=$(iwinfo "$_if" info 2>/dev/null)
+    _assoc=$(iwinfo "$_if" assoclist 2>/dev/null)
+    [ -n "$_info$_assoc" ] || return 1
+
+    _mode=$(printf '%s\n' "$_info" | awk '{for(i=1;i<=NF;i++) if($i=="Mode:"){print $(i+1); exit}}')
+    _freq=$(printf '%s\n' "$_info" | sed -n 's/.*(\([0-9]\{3,\}\)[[:space:]]*MHz).*/\1/p' | head -1)
+    if [ -z "$_freq" ]; then
+        _ghz=$(printf '%s\n' "$_info" | sed -n 's/.*[ (]\([0-9]\+\.[0-9]\+\)[[:space:]]*GHz.*/\1/p' | head -1)
+        [ -n "$_ghz" ] && _freq=$(awk -v g="$_ghz" 'BEGIN{printf "%d", g*1000}')
+    fi
+    _noise=$(printf '%s\n' "$_info" | awk '{for(i=1;i<=NF;i++) if($i=="Noise:"){print $(i+1); exit}}')
+    # "Tx-Power: 23 dBm"
+    _txpower=$(printf '%s\n' "$_info" | sed -n 's/.*Tx-Power:[[:space:]]*\(-\{0,1\}[0-9]\{1,\}\).*/\1/p' | head -1)
+
+    printf 'MODE %s\nFREQ %s\nNOISE %s\nTXPOWER %s\n' "$_mode" "$_freq" "$_noise" "$_txpower"
+
+    printf '%s\n' "$_assoc" | awk '
+        BEGIN { IGNORECASE=1; n=0 }
+        /^[[:space:]]*([0-9a-f]{2}:){5}[0-9a-f]{2}[[:space:]]/ {
+            n++
+            if (match($0, /SNR[[:space:]]*-?[0-9]+/)) { s=substr($0,RSTART,RLENGTH); gsub(/[^0-9-]/,"",s); print "SNR " s }
+            next
+        }
+        /^[[:space:]]*RX:[[:space:]]*[0-9]/ { print "RX " ($2 + 0) }
+        /^[[:space:]]*TX:[[:space:]]*[0-9]/ { print "TX " ($2 + 0) }
+        END { print "ASSOC " n }
+    '
+
+    # Fallback for client/STA where assoclist is empty: single current values.
+    if ! printf '%s\n' "$_assoc" | grep -qiE '([0-9a-f]{2}:){5}[0-9a-f]{2}'; then
+        _br=$(printf '%s\n' "$_info" | awk '{for(i=1;i<=NF;i++) if($i=="Rate:"){print $(i+1); exit}}')
+        _sig=$(printf '%s\n' "$_info" | awk '{for(i=1;i<=NF;i++) if($i=="Signal:"){print $(i+1); exit}}')
+        _br=$(sanitize_int "$_br")
+        if [ "$_br" -gt 0 ] 2>/dev/null; then printf 'RX %s\nTX %s\n' "$_br" "$_br"; fi
+        # Derive SNR only from a real signal reading (not absent / 0 / "unknown");
+        # sanitize_int defaults to 0, so guard on the RAW value first.
+        case "$_sig" in
+            ''|0|unknown|*[!0-9-]*) ;;
+            *)
+                _nz=$(sanitize_int "$_noise")
+                [ "$_nz" != 0 ] && printf 'SNR %s\n' "$(( $(sanitize_int "$_sig") - _nz ))"
+                ;;
+        esac
+    fi
+    return 0
+}
+
+# iface_airtime <iface>: channel airtime utilisation (percent) from hostapd ubus,
+# or empty when unavailable (no ubus/jsonfilter, or client/STA without hostapd).
+iface_airtime() {
+    command -v ubus >/dev/null 2>&1 || return 0
+    command -v jsonfilter >/dev/null 2>&1 || return 0
+    ubus call "hostapd.$1" get_status 2>/dev/null | jsonfilter -e '@.airtime.utilization' 2>/dev/null
+}
+
+# iface_stats <iface>: emit the 14 numeric metric fields (tab-separated) in
+# record column order 4..17: clients freq noise tx{min,avg,max} rx{min,avg,max}
+# snr{min,avg,max} channelUtil txPower, plus a 15th trailing mode tag (used by
+# build_snapshot for the AP-side aggregate, not an OID column).
+iface_stats() {
+    _if="$1"
+    _block=$(stats_via_ubus "$_if") || _block=""
+    [ -n "$_block" ] || _block=$(stats_via_cli "$_if") || _block=""
+    # Channel utilisation is hostapd-only; append it to the block.
+    _block="$_block
+UTIL $(iface_airtime "$_if")"
+
+    _mode=$(printf '%s\n' "$_block" | awk '$1=="MODE"{print $2; exit}')
+    _agg=$(printf '%s\n' "$_block" | awk '
+        $1=="FREQ"    {freq=$2}
+        $1=="NOISE"   {noise=$2}
+        $1=="ASSOC"   {assoc=$2}
+        $1=="UTIL"    {util=$2}
+        $1=="TXPOWER" {txpower=$2}
+        $1=="RX"  {v=$2+0; rc++; rsum+=v; if(rmin==""||v<rmin)rmin=v; if(v>rmax)rmax=v}
+        $1=="TX"  {v=$2+0; tc++; tsum+=v; if(tmin==""||v<tmin)tmin=v; if(v>tmax)tmax=v}
+        $1=="SNR" {v=$2+0; sc++; ssum+=v; if(smin==""||v<smin)smin=v; if(v>smax)smax=v}
+        END {
+            printf "%d|%d|%d|%d|%d|%d|%d|%d|%d|%d|%d|%d|%d|%d\n",
+                (assoc==""?0:assoc), (freq==""?0:freq), (noise==""?0:noise),
+                (tmin==""?0:tmin),(tc?tsum/tc:0),(tmax==""?0:tmax),
+                (rmin==""?0:rmin),(rc?rsum/rc:0),(rmax==""?0:rmax),
+                (smin==""?0:smin),(sc?ssum/sc:0),(smax==""?0:smax),
+                (util==""?0:util), (txpower==""?0:txpower)
+        }')
+    IFS='|' read -r _assoc _freq _noise _tmin _tavg _tmax _rmin _ravg _rmax _smin _savg _smax _util _txpower <<EOF
+$_agg
+EOF
+
+    # clients: AP -> validated hostapd dedup via wlClients.sh; client/STA -> peer
+    # count (assoc list usually holds the upstream AP; 0/1 link-up otherwise).
+    case "$(to_lower "$_mode")" in
+        client|sta|mesh*|adhoc|ad-hoc)
+            if [ "${_assoc:-0}" -gt 0 ] 2>/dev/null; then
+                _clients="$_assoc"
+            else
+                _clients=$(iface_associated "$_if")
+            fi
+            ;;
+        *)
+            _clients=$("$WLCLIENTS" "$_if" 2>/dev/null </dev/null | awk 'NF{print $1; exit}')
+            case "$_clients" in ''|*[!0-9]*) _clients="${_assoc:-0}" ;; esac
+            ;;
+    esac
+
+    # 14 metric fields (record columns 4..17) + a trailing mode tag (field 18,
+    # not an OID column) used only by build_snapshot to compute the AP-side
+    # aggregate client count without re-running discovery.
+    printf '%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n' \
+        "$(sanitize_int "$_clients")" "$(sanitize_int "$_freq")" "$(sanitize_int "$_noise")" \
+        "$(sanitize_int "$_tmin")" "$(sanitize_int "$_tavg")" "$(sanitize_int "$_tmax")" \
+        "$(sanitize_int "$_rmin")" "$(sanitize_int "$_ravg")" "$(sanitize_int "$_rmax")" \
+        "$(sanitize_int "$_smin")" "$(sanitize_int "$_savg")" "$(sanitize_int "$_smax")" \
+        "$(sanitize_int "$_util")" "$(sanitize_int "$_txpower")" "$(to_lower "$_mode")"
+}
+
+collect_records() {
+    if [ -n "${OPENWRT_WL_MOCK:-}" ]; then
+        cat "$OPENWRT_WL_MOCK"
+        return
+    fi
+
+    # Discovery + labelling is delegated to the validated wlInterfaces.sh,
+    # which emits "<iface>,<iface> (<label>)" (or "<iface>,<iface>").
+    # </dev/null so the helper can't read the pass_persist protocol pipe.
+    "$WLIFACES" 2>/dev/null </dev/null | while IFS= read -r line; do
+        iface=$(printf '%s' "$line" | cut -d',' -f1)
+        [ -n "$iface" ] || continue
+
+        ifindex=$(iface_ifindex "$iface")
+        case "$ifindex" in
+            ''|*[!0-9]*) continue ;;   # no usable ifIndex -> cannot index row
+        esac
+
+        # Label = text inside the trailing "(...)", else the interface name.
+        label=$(printf '%s' "$line" | sed -n 's/.*(\(.*\))$/\1/p')
+        [ -n "$label" ] || label="$iface"
+
+        # iface_stats emits 14 metric fields (record cols 4..17) + a mode tag.
+        printf '%s\t%s\t%s\t%s\n' "$ifindex" "$iface" "$label" "$(iface_stats "$iface")"
+    done
+}
+
+# --------------------------------------------------------------------------
+# Snapshot: emit all instance OIDs in lexicographic (numeric) order as
+# "<oid>\t<type>\t<value>" lines. Order is produced directly (scalars, then
+# column-major over the table) so no post-sort is required.
+# --------------------------------------------------------------------------
+build_snapshot() {
+    records=$(collect_records)
+    ifcount=$(printf '%s\n' "$records" | awk 'NF' | wc -l | awk '{print $1}')
+    # AP-side aggregate client count, computed from the records we already
+    # collected (no second discovery pass). Field 18 is the per-iface mode tag;
+    # client/STA/mesh/adhoc uplinks are excluded. Mock records have no field 18,
+    # so an empty mode counts as AP.
+    clients=$(printf '%s\n' "$records" | awk -F '\t' '
+        NF { m = tolower($18); if (m !~ /client|sta|mesh|adhoc|ad-hoc/) s += $4 }
+        END { print s + 0 }')
+
+    {
+        printf '%s\t%s\t%s\n' "$IFCOUNT_OID" "gauge" "$(sanitize_int "$ifcount")"
+        printf '%s\t%s\t%s\n' "$CLIENTS_OID" "gauge" "$(sanitize_int "$clients")"
+
+        printf '%s\n' "$records" | awk 'NF' | sort -t"$TAB" -k1,1n | awk -F '\t' -v entry="$ENTRY" '
+            { n++; idx[n]=$1; for (f=1; f<=17; f++) v[n,f]=$f }
+            END {
+                for (c = 2; c <= 17; c++) {
+                    type = (c==2 || c==3) ? "string" : ((c==6 || (c>=13 && c<=15) || c==17) ? "integer" : "gauge")
+                    for (i = 1; i <= n; i++) {
+                        printf "%s.%d.%s\t%s\t%s\n", entry, c, idx[i], type, v[i,c]
+                    }
+                }
+            }'
+    } > "$SNAP_FILE"
+}
+
+refresh_snapshot() {
+    t=$(now)
+    if [ ! -s "$SNAP_FILE" ] || [ "$((t - SNAP_TS))" -ge "$TTL" ]; then
+        build_snapshot
+        SNAP_TS=$t
+    fi
+}
+
+# --------------------------------------------------------------------------
+# Request handling
+# --------------------------------------------------------------------------
+emit_none() { echo "NONE"; }
+
+handle_get() {
+    req="$1"
+    refresh_snapshot
+    awk -F '\t' -v req="$req" '
+        $1 == req { print $1; print $2; print $3; found=1; exit }
+        END { if (!found) print "NONE" }
+    ' "$SNAP_FILE"
+}
+
+handle_getnext() {
+    req="$1"
+    refresh_snapshot
+    # Snapshot is pre-sorted; return the first OID numerically greater than req.
+    awk -F '\t' -v req="$req" '
+        function oidgt(a, b,   na, nb, m, i, x, y) {
+            na = split(a, A, "."); nb = split(b, B, ".")
+            m = (na > nb) ? na : nb
+            for (i = 1; i <= m; i++) {
+                x = (i <= na) ? A[i] + 0 : -1
+                y = (i <= nb) ? B[i] + 0 : -1
+                if (x > y) return 1
+                if (x < y) return -1
+            }
+            return 0
+        }
+        oidgt($1, req) > 0 { print $1; print $2; print $3; found=1; exit }
+        END { if (!found) print "NONE" }
+    ' "$SNAP_FILE"
+}
+
+# --------------------------------------------------------------------------
+# One-shot CLI (testing / pass-style), or pass_persist stdin loop.
+# --------------------------------------------------------------------------
+case "${1:-}" in
+    -g) handle_get "$2"; exit 0 ;;
+    -n) handle_getnext "$2"; exit 0 ;;
+    --collect)     collect_records; exit 0 ;;       # debug: print interface records
+    --stats)       iface_stats "$2"; exit 0 ;;      # debug: print one iface's metrics
+    --snapshot)    build_snapshot; cat "$SNAP_FILE"; exit 0 ;;  # debug: full OID table
+    -h|--help)
+        echo "Usage: $0 [-g OID | -n OID | --collect | --stats IFACE | --snapshot]" >&2
+        echo "       (no args: pass_persist mode on stdin)" >&2
+        exit 0 ;;
+esac
+
+# pass_persist protocol
+while read -r cmd; do
+    case "$cmd" in
+        PING|ping) echo "PONG" ;;
+        get)     read -r oid; handle_get "$oid" ;;
+        getnext) read -r oid; handle_getnext "$oid" ;;
+        set)     read -r oid; read -r _val; echo "not-writable" ;;
+        "")      : ;;
+        *)       : ;;
+    esac
+done
diff --git a/snmp/Openwrt/wlClients.sh b/snmp/Openwrt/wlClients.sh
index 72e3694cb..c4faa374d 100755
--- a/snmp/Openwrt/wlClients.sh
+++ b/snmp/Openwrt/wlClients.sh
@@ -1,33 +1,149 @@
 #!/bin/sh
+set -e
 
-# wlClients.sh
-# Counts connected (associated) Wi-Fi devices
-# Arguments: targed interface. Assumes all interfaces if no argument
+# wlClients.sh - OpenWrt wireless client count via ubus or fallback
+# Usage: wlClients.sh [interface]  # outputs integer count, always exit 0 for SNMP
 
-# Check number of arguments
-if [ $# -gt 1 ]; then
-	/bin/echo "Usage: wlClients.sh interface"
-	/bin/echo "Too many command line arguments, exiting."
-	exit 1
-fi
+scriptdir="$(cd "$(dirname "$0")" && pwd)"
+interfaces_script="$scriptdir/wlInterfaces.sh"
+
+normalize_iface() {
+  # Keep only expected interface characters and strip CR/LF noise.
+  printf '%s' "$1" | tr -d '\r\n' | sed 's/^[[:space:]]*//; s/[[:space:]]*$//' | sed 's/[^A-Za-z0-9._:-]//g'
+}
+
+count_iface_clients() {
+  iface="$1"
+  new=0
+
+  if ubus call "hostapd.$iface" get_clients >/dev/null 2>&1; then
+    new=$(list_assoc_macs_ubus "$iface" | awk 'NF' | sort -u | wc -l | awk '{print $1}')
+  else
+    # Fallback: iwinfo for generic OpenWrt
+    new=$(list_assoc_macs_iwinfo "$iface" | awk 'NF' | sort -u | wc -l | awk '{print $1}')
+  fi
+
+  # Normalize to a single integer token to avoid arithmetic parse errors.
+  new=$(printf '%s\n' "$new" | awk 'NF {print $1; exit}')
+  case "$new" in
+    ''|*[!0-9]*) new=0 ;;
+  esac
+
+  printf '%s\n' "$new"
+}
+
+list_assoc_macs_ubus() {
+  iface="$1"
+  ubus call "hostapd.$iface" get_clients 2>/dev/null | awk '
+    BEGIN { IGNORECASE=1; mac=""; mld="" }
+    /^[[:space:]]*"([0-9a-f]{2}:){5}[0-9a-f]{2}"[[:space:]]*:[[:space:]]*\{/ {
+      if (mac != "") {
+        if (mld != "" && mld != "00:00:00:00:00:00") {
+          print mld
+        } else {
+          print mac
+        }
+      }
+      if (match($0, /"([0-9a-f]{2}:){5}[0-9a-f]{2}"/)) {
+        mac=tolower(substr($0, RSTART+1, RLENGTH-2))
+        mld=""
+      }
+    }
+    /"mld_addr"[[:space:]]*:[[:space:]]*"([0-9a-f]{2}:){5}[0-9a-f]{2}"/ {
+      if (match($0, /"([0-9a-f]{2}:){5}[0-9a-f]{2}"[[:space:]]*$/)) {
+        val=tolower(substr($0, RSTART+1, RLENGTH-2))
+        if (val != "00:00:00:00:00:00") {
+          mld=val
+        }
+      } else if (match($0, /"([0-9a-f]{2}:){5}[0-9a-f]{2}"/)) {
+        val=tolower(substr($0, RSTART+1, RLENGTH-2))
+        if (val != "00:00:00:00:00:00") {
+          mld=val
+        }
+      }
+    }
+    END {
+      if (mac != "") {
+        if (mld != "" && mld != "00:00:00:00:00:00") {
+          print mld
+        } else {
+          print mac
+        }
+      }
+    }
+  '
+}
+
+list_assoc_macs_iwinfo() {
+  iface="$1"
+  iwinfo "$iface" assoclist 2>/dev/null | awk '
+    BEGIN { IGNORECASE=1 }
+    /^[[:space:]]*([0-9a-f]{2}:){5}[0-9a-f]{2}[[:space:]]/ {
+      print tolower($1)
+    }
+  '
+}
+
+count_aggregate_unique_clients() {
+  interfaces="$1"
 
-# Get path to this script
-scriptdir=$(dirname "$(readlink -f -- "$0")")
+  if [ -z "$interfaces" ]; then
+    echo 0
+    return
+  fi
 
-# Get interface list. Set target, which is name returned for interface
-if [ "$1" ]; then
-	interfaces=$1
+  tmp="/tmp/wlClients.macs.$$"
+  trap 'rm -f "$tmp"' EXIT
+  : > "$tmp"
+
+  for iface in $interfaces; do
+    iface=$(normalize_iface "$iface")
+    [ -n "$iface" ] || continue
+
+    if ubus call "hostapd.$iface" get_clients >/dev/null 2>&1; then
+      list_assoc_macs_ubus "$iface" >> "$tmp" || true
+    else
+      list_assoc_macs_iwinfo "$iface" >> "$tmp" || true
+    fi
+  done
+
+  awk 'NF' "$tmp" | sort -u | wc -l | awk '{print $1}'
+}
+
+get_live_interfaces() {
+  # Reuse wlInterfaces.sh so we only count interfaces currently exported to LibreNMS.
+  if [ -x "$interfaces_script" ]; then
+    "$interfaces_script" 2>/dev/null | while IFS= read -r line; do
+      iface=$(printf '%s' "$line" | cut -d',' -f1)
+      iface=$(normalize_iface "$iface")
+      [ -n "$iface" ] && printf '%s\n' "$iface"
+    done | awk '!seen[$0]++'
+  fi
+}
+
+# Args: single iface or all
+if [ "${1:-}" ]; then
+  interfaces="$(normalize_iface "$1")"
 else
-	interfaces=$(cat "$scriptdir"/wlInterfaces.txt | cut -f 1 -d",")
+  interfaces=$(get_live_interfaces)
 fi
 
-# Count associated devices
 count=0
-for interface in $interfaces
-do
-	new=$(/usr/sbin/iw dev "$interface" station dump 2>/dev/null | /bin/grep Station | /usr/bin/cut -f 2 -s -d" " | /usr/bin/wc -l)
-  	count=$(( $count + $new ))
-done
-
-# Return snmp result
-/bin/echo $count
+
+if [ "${1:-}" ]; then
+  # Per-interface mode (used by clients-<iface>)
+  for iface in $interfaces; do
+    iface=$(normalize_iface "$iface")
+    [ -n "$iface" ] || continue
+    new=$(count_iface_clients "$iface")
+    count=$((count + new))
+  done
+else
+  # Aggregate mode (clients-wlan): dedupe MACs to avoid MLO/MLD double-counting.
+  count=$(count_aggregate_unique_clients "$interfaces")
+fi
+
+# Output count first line for nsExtendOutput1Line queries.
+echo "$count"
+echo "# wlClients for $interfaces"
+exit 0
diff --git a/snmp/Openwrt/wlFrequency.sh b/snmp/Openwrt/wlFrequency.sh
index 4552cc4b7..67133e1ff 100755
--- a/snmp/Openwrt/wlFrequency.sh
+++ b/snmp/Openwrt/wlFrequency.sh
@@ -2,7 +2,7 @@
 
 # wlFrequency.sh
 # Returns wlFrequency, in MHz (not channel number)
-# Arguments: targed interface
+# Arguments: target interface
 
 # Check number of arguments
 if [ $# -ne 1 ]; then
@@ -14,5 +14,6 @@ fi
 # Extract frequency
 frequency=$(/usr/sbin/iw dev "$1" info 2>/dev/null | /bin/grep channel | /usr/bin/cut -f 2- -s -d" " | /usr/bin/cut -f 2- -s -d"(" | /usr/bin/cut -f 1 -s -d" ")
 
-# Return snmp result
+# Return snmp result (multi-line for nsExtendOutputFull)
 /bin/echo "$frequency"
+/bin/echo "# wlFrequency for $1"
diff --git a/snmp/Openwrt/wlInterfaces.sh b/snmp/Openwrt/wlInterfaces.sh
new file mode 100755
index 000000000..245c36a61
--- /dev/null
+++ b/snmp/Openwrt/wlInterfaces.sh
@@ -0,0 +1,315 @@
+#!/bin/sh
+set -eu
+
+# wlInterfaces.sh - Emit OpenWrt wireless interfaces for LibreNMS.
+# Output format: <interface>,<display-name>
+#
+# Display name behavior:
+# - Prefer SSID (ex: bmg)
+# - If multiple interfaces share SSID, append band suffix (ex: moodsy24, moodsy5, moodsy6)
+
+tmp="/tmp/wlInterfaces.$$.tmp"
+trap 'rm -f "$tmp"' EXIT
+
+get_json_value() {
+  key="$1"
+  if command -v jsonfilter >/dev/null 2>&1; then
+    jsonfilter -e "@.$key" 2>/dev/null || true
+  else
+    sed -n "s/.*\"$key\"[[:space:]]*:[[:space:]]*\"\([^\"]*\)\".*/\1/p" | head -1
+  fi
+}
+
+get_ssid_from_hostapd() {
+  iface="$1"
+  hapd="hostapd.$iface"
+
+  status_json=$(ubus call "$hapd" get_status 2>/dev/null || true)
+  ssid=$(printf '%s' "$status_json" | get_json_value ssid)
+  if [ -n "$ssid" ]; then
+    printf '%s' "$ssid"
+    return
+  fi
+
+  config_json=$(ubus call "$hapd" get_config 2>/dev/null || true)
+  ssid=$(printf '%s' "$config_json" | get_json_value ssid)
+  if [ -n "$ssid" ]; then
+    printf '%s' "$ssid"
+  fi
+}
+
+is_iface_active_hostapd() {
+  iface="$1"
+  hapd="hostapd.$iface"
+  status_json=$(ubus call "$hapd" get_status 2>/dev/null || true)
+
+  # Accept common active states across OpenWrt variants.
+  up=$(printf '%s' "$status_json" | get_json_value up)
+  state=$(printf '%s' "$status_json" | get_json_value state)
+  status=$(printf '%s' "$status_json" | get_json_value status)
+
+  case "$up" in
+    1|true|TRUE|True) return 0 ;;
+  esac
+  case "$state" in
+    ENABLED|enabled|RUNNING|running) return 0 ;;
+  esac
+  case "$status" in
+    ENABLED|enabled|RUNNING|running) return 0 ;;
+  esac
+
+  return 1
+}
+
+get_ssid_from_iwinfo() {
+  iface="$1"
+  iwinfo "$iface" info 2>/dev/null | sed -n 's/.*ESSID:[[:space:]]*"\([^"]*\)".*/\1/p' | head -1
+}
+
+get_iwinfo_info() {
+  iface="$1"
+  iwinfo "$iface" info 2>/dev/null || true
+}
+
+get_mode_from_iwinfo() {
+  printf '%s\n' "$1" | awk '/^[[:space:]]*Mode:[[:space:]]/ {print $2; exit}'
+}
+
+get_signal_from_iwinfo() {
+  printf '%s\n' "$1" | sed -n 's/.*Signal:[[:space:]]*\([^ ]\+\)[[:space:]]*dBm.*/\1/p' | head -1
+}
+
+get_bitrate_from_iwinfo() {
+  printf '%s\n' "$1" | sed -n 's/.*Bit Rate:[[:space:]]*\([^ ]\+\).*/\1/p' | head -1
+}
+
+get_access_point_from_iwinfo() {
+  printf '%s\n' "$1" | sed -n 's/.*Access Point:[[:space:]]*\([^ ]\+\).*/\1/p' | head -1
+}
+
+should_include_iwinfo_iface() {
+  iface="$1"
+  info=$(get_iwinfo_info "$iface")
+  [ -n "$info" ] || return 1
+
+  ssid=$(printf '%s\n' "$info" | sed -n 's/.*ESSID:[[:space:]]*"\([^"]*\)".*/\1/p' | head -1)
+  case "$ssid" in
+    ''|unknown) return 1 ;;
+  esac
+
+  # Skip synthetic VLAN helper interfaces.
+  printf '%s\n' "$info" | grep -q '(VLAN)' && return 1
+
+  mode=$(get_mode_from_iwinfo "$info")
+  access_point=$(get_access_point_from_iwinfo "$info")
+
+  case "$mode" in
+    Client)
+      case "$access_point" in
+        ''|Not-Associated|00:00:00:00:00:00) return 1 ;;
+      esac
+      return 0
+      ;;
+    Master)
+      # Master-mode AP: include if ESSID is valid (checked above).
+      # Signal/bitrate at the AP interface level report 0/unknown when
+      # no clients are associated, so they cannot be used as filters.
+      return 0
+      ;;
+  esac
+
+  return 1
+}
+
+is_clearly_inactive_master_iface() {
+  iface="$1"
+  info=$(get_iwinfo_info "$iface")
+  [ -n "$info" ] || return 1
+
+  mode=$(get_mode_from_iwinfo "$info")
+  [ "$mode" = "Master" ] || return 1
+
+  signal=$(get_signal_from_iwinfo "$info")
+  bitrate=$(get_bitrate_from_iwinfo "$info")
+
+  # If hostapd reports airtime usage, keep this interface.
+  # This preserves active VAPs that still show Signal=0/Bit Rate=unknown in iwinfo.
+  air_util=$(get_hostapd_airtime_utilization "$iface")
+  case "$air_util" in
+    ''|unknown) ;;
+    *)
+      if [ "$air_util" -gt 0 ] 2>/dev/null; then
+        return 1
+      fi
+      ;;
+  esac
+
+  # Some idle/placeholder VAPs report Signal=0 and unknown bitrate.
+  # Treat only this exact combination as inactive.
+  [ "$signal" = "0" ] || return 1
+  [ "$bitrate" = "unknown" ] || return 1
+  return 0
+}
+
+is_hostapd_managed_iface() {
+  iface="$1"
+  ubus list "hostapd.$iface" >/dev/null 2>&1
+}
+
+# Enumerate wireless interface names using iw (nl80211) or sysfs.
+# More reliable than parsing `iwinfo` without arguments.
+enum_wireless_ifaces() {
+  if command -v iw >/dev/null 2>&1; then
+    iw dev 2>/dev/null | awk '/[[:space:]]Interface[[:space:]]/{print $2}'
+    return
+  fi
+  for p in /sys/class/net/*/phy80211 /sys/class/net/*/wireless; do
+    [ -d "$p" ] || continue
+    basename "$(dirname "$p")"
+  done | sort -u
+}
+
+get_freq_mhz_from_hostapd() {
+  iface="$1"
+  hapd="hostapd.$iface"
+  status_json=$(ubus call "$hapd" get_status 2>/dev/null || true)
+  printf '%s' "$status_json" | get_json_value freq
+}
+
+get_hostapd_airtime_utilization() {
+  iface="$1"
+  hapd="hostapd.$iface"
+  status_json=$(ubus call "$hapd" get_status 2>/dev/null || true)
+  if command -v jsonfilter >/dev/null 2>&1; then
+    printf '%s' "$status_json" | jsonfilter -e '@.airtime.utilization' 2>/dev/null || true
+  fi
+}
+
+get_band_suffix() {
+  iface="$1"
+  freq_mhz_hint="${2:-}"
+
+  # If we already have a hostapd freq (MHz), use it directly.
+  if [ -n "$freq_mhz_hint" ]; then
+    case "$freq_mhz_hint" in
+      *[!0-9]*|'') ;;
+      *)
+        if [ "$freq_mhz_hint" -ge 5925 ]; then
+          printf '6'
+          return
+        elif [ "$freq_mhz_hint" -ge 4900 ]; then
+          printf '5'
+          return
+        elif [ "$freq_mhz_hint" -ge 2300 ]; then
+          printf '24'
+          return
+        fi
+        ;;
+    esac
+  fi
+
+  info=$(iwinfo "$iface" info 2>/dev/null || true)
+
+  # Prefer explicit frequency in GHz if present.
+  freq=$(printf '%s\n' "$info" | sed -n 's/.*Frequency:[[:space:]]*\([0-9.]\+\).*/\1/p' | head -1)
+  freq_mhz=''
+  if [ -n "$freq" ]; then
+    freq_mhz=$(printf '%s\n' "$freq" | awk '{printf "%d", ($1 * 1000)}')
+  fi
+  # Fall back to channel mapping if frequency wasn't parsed.
+  channel=$(printf '%s\n' "$info" | sed -n 's/.*Channel:[[:space:]]*\([0-9]\+\).*/\1/p' | head -1)
+
+  if [ -n "$freq_mhz" ]; then
+    if [ "$freq_mhz" -ge 5925 ]; then
+      printf '6'
+      return
+    elif [ "$freq_mhz" -ge 4900 ]; then
+      printf '5'
+      return
+    elif [ "$freq_mhz" -ge 2300 ]; then
+      printf '24'
+      return
+    fi
+  fi
+
+  case "$freq" in
+    2.*) printf '24' ;;
+    5.*) printf '5' ;;
+    6.*) printf '6' ;;
+    *)
+      case "$channel" in
+        '' ) printf '' ;;
+        [1-9]|1[0-4]) printf '24' ;;
+        3[0-9]|4[0-9]|5[0-9]|6[0-9]|7[0-9]|8[0-9]|9[0-9]|1[0-7][0-9]) printf '5' ;;
+        2[0-9][0-9]|3[0-9][0-9]) printf '6' ;;
+        *) printf '' ;;
+      esac
+      ;;
+  esac
+}
+
+emit_iface_records() {
+  if ubus list hostapd.* >/dev/null 2>&1; then
+    ubus list hostapd.* 2>/dev/null | sed 's/^hostapd\.//' | while IFS= read -r iface; do
+      [ -n "$iface" ] || continue
+      is_iface_active_hostapd "$iface" || continue
+      if command -v iwinfo >/dev/null 2>&1; then
+        is_clearly_inactive_master_iface "$iface" && continue
+      fi
+      ssid=$(get_ssid_from_hostapd "$iface")
+      if [ -z "$ssid" ] && command -v iwinfo >/dev/null 2>&1; then
+        ssid=$(get_ssid_from_iwinfo "$iface")
+      fi
+      band=''
+      if command -v iwinfo >/dev/null 2>&1; then
+        freq_mhz=$(get_freq_mhz_from_hostapd "$iface")
+        band=$(get_band_suffix "$iface" "$freq_mhz")
+      fi
+      [ -n "$ssid" ] || ssid="$iface"
+      printf '%s\t%s\t%s\n' "$iface" "$ssid" "$band"
+    done
+  fi
+
+  if command -v iwinfo >/dev/null 2>&1; then
+    enum_wireless_ifaces | while IFS= read -r iface; do
+      [ -n "$iface" ] || continue
+      is_hostapd_managed_iface "$iface" && continue
+      should_include_iwinfo_iface "$iface" || continue
+      ssid=$(get_ssid_from_iwinfo "$iface")
+      [ -n "$ssid" ] || ssid="$iface"
+      band=$(get_band_suffix "$iface")
+      printf '%s\t%s\t%s\n' "$iface" "$ssid" "$band"
+    done
+  fi
+}
+
+emit_iface_records > "$tmp"
+
+awk -F '\t' '
+  {
+    iface=$1
+    if (!(iface in seen)) {
+      seen[iface]=1
+      rows[++row_count]=$0
+      ssid=$2
+      if (ssid != "") count[ssid]++
+    }
+  }
+  END {
+    for (i=1; i<=row_count; i++) {
+      split(rows[i], f, "\t")
+      iface=f[1]; ssid=f[2]; band=f[3]
+      label=ssid
+      if (count[ssid] > 1 && band != "" && ssid != iface) {
+        label=ssid band
+      }
+      if (label == "" || label == iface) {
+        printf "%s,%s\n", iface, iface
+      } else {
+        printf "%s,%s (%s)\n", iface, iface, label
+      }
+    }
+  }
+' "$tmp"
+
+exit 0
diff --git a/snmp/Openwrt/wlInterfaces.txt b/snmp/Openwrt/wlInterfaces.txt
deleted file mode 100755
index bfe882e0e..000000000
--- a/snmp/Openwrt/wlInterfaces.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-wlan0,wl-2.4G
-wlan1,wl-5.0G
diff --git a/snmp/Openwrt/wlNoiseFloor.sh b/snmp/Openwrt/wlNoiseFloor.sh
index 102cde435..97a574af0 100755
--- a/snmp/Openwrt/wlNoiseFloor.sh
+++ b/snmp/Openwrt/wlNoiseFloor.sh
@@ -2,7 +2,7 @@
 
 # wlNoiseFloor.sh
 # Returns wlNoiseFloor, in dBm
-# Arguments: targed interface
+# Arguments: target interface
 
 # Check number of arguments
 if [ $# -ne 1 ]; then
@@ -15,5 +15,20 @@ fi
 # Use tail, not head (i.e. last line, not first), as head exits immediately, breaks the pipe to cut!
 noise=$(/usr/bin/iwinfo "$1" assoclist 2>/dev/null | grep -v "^$" | /usr/bin/cut -s -d "/" -f 2 | /usr/bin/cut -s -d "(" -f 1 | /usr/bin/cut -s -d " " -f 2 | /usr/bin/tail -1)
 
-# Return snmp result
+# Fallback for client-mode interfaces where assoclist is empty.
+if [ -z "$noise" ]; then
+	noise=$(/usr/bin/iwinfo "$1" info 2>/dev/null | awk '
+		/Noise:[[:space:]]*-?[0-9]+[[:space:]]*dBm/ {
+			for (i = 1; i <= NF; i++) {
+				if ($i == "Noise:") {
+					print $(i+1)
+					exit
+				}
+			}
+		}
+	')
+fi
+
+# Return snmp result (multi-line for nsExtendOutputFull)
 /bin/echo "$noise"
+/bin/echo "# wlNoiseFloor for $1"
diff --git a/snmp/Openwrt/wlRate.sh b/snmp/Openwrt/wlRate.sh
index d53068560..21cac457c 100755
--- a/snmp/Openwrt/wlRate.sh
+++ b/snmp/Openwrt/wlRate.sh
@@ -14,19 +14,69 @@ if [ $# -ne 3 ]; then
 	exit 1
 fi
 
-# Calculate result. Sum just for debug, and have to return integer
-# => If not integer (e.g. 2.67e+07), LibreNMS will drop the exponent (result, 2.67 bits/sec!)
-ratelist=$(/usr/sbin/iw dev "$1" station dump 2>/dev/null | /bin/grep "$2 bitrate" | /usr/bin/cut -f 2 -s -d" ")
-result=0
-if [ "$3" = "sum" ]; then
-  result=$(/bin/echo "$ratelist" | /usr/bin/awk -F ':' '{sum += $2} END {printf "%d\n", 1000000*sum}')
-elif [ "$3" = "avg" ]; then
-  result=$(/bin/echo "$ratelist" | /usr/bin/awk -F ':' '{sum += $2} END {printf "%d\n", 1000000*sum/NR}')
-elif [ "$3" = "min" ]; then
-  result=$(/bin/echo "$ratelist" | /usr/bin/awk -F ':' 'NR == 1 || $2 < min {min = $2} END {printf "%d\n", 1000000*min}')
-elif [ "$3" = "max" ]; then
-  result=$(/bin/echo "$ratelist" | /usr/bin/awk -F ':' 'NR == 1 || $2 > max {max = $2} END {printf "%d\n", 1000000*max}')
+iface="$1"
+dir="$2"
+
+IW_BIN=$(command -v iw 2>/dev/null || true)
+IWINFO_BIN=$(command -v iwinfo 2>/dev/null || true)
+
+# Extract numeric bitrate values from "tx bitrate:" / "rx bitrate:" lines.
+# Example input line:
+#   tx bitrate:     1201.0 MBit/s HE-MCS 11 HE-NSS 2 HE-GI 0 HE-DCM 0
+ratelist=""
+if [ -n "$IW_BIN" ]; then
+  ratelist=$($IW_BIN dev "$iface" station dump 2>/dev/null | awk -v d="$dir" '
+    {
+      key1 = tolower($1)
+      key2 = tolower($2)
+      if (key1 == d && key2 == "bitrate:") {
+        for (i = 3; i <= NF; i++) {
+          if ($i ~ /^[0-9]+(\.[0-9]+)?$/) {
+            print $i
+            break
+          }
+        }
+      }
+    }
+  ')
+fi
+
+# Fallback for devices where iw station dump is unavailable or differently formatted.
+if [ -z "$ratelist" ] && [ -n "$IWINFO_BIN" ]; then
+  ratelist=$($IWINFO_BIN "$iface" assoclist 2>/dev/null | awk -v d="$dir" '
+    {
+      key = tolower($1)
+      sub(/:$/, "", key)
+
+      if (key == d && $2 ~ /^[0-9]+(\.[0-9]+)?$/) {
+        print $2
+      }
+    }
+  ')
 fi
 
-# Return snmp result
-echo "$result"
+# Final fallback for client-mode interfaces where iwinfo info exposes a single current rate.
+if [ -z "$ratelist" ] && [ -n "$IWINFO_BIN" ]; then
+  ratelist=$($IWINFO_BIN "$iface" info 2>/dev/null | awk '
+    /Bit Rate:[[:space:]]*[0-9]+(\.[0-9]+)?[[:space:]]*MBit\/s/ {
+      print $3
+      exit
+    }
+  ')
+fi
+
+# Calculate min/avg/max rates
+min_rate=$(/bin/echo "$ratelist" | awk 'NR==1{min=$1} $1<min{min=$1} END{printf "%d\n", (min=="" ? 0 : min)}')
+avg_rate=$(/bin/echo "$ratelist" | awk '{sum+=$1; n++} END{printf "%d\n", (n>0 ? sum/n : 0)}')
+max_rate=$(/bin/echo "$ratelist" | awk '$1>max{max=$1} END{printf "%d\n", (max=="" ? 0 : max)}')
+
+case "$3" in
+  min) echo "$min_rate" ;;
+  avg) echo "$avg_rate" ;;
+  max) echo "$max_rate" ;;
+  *)   echo "0" ;;
+esac
+
+# Second line for nsExtendOutputFull compatibility
+echo "# wlRate $1 $2 $3"
+exit 0
diff --git a/snmp/Openwrt/wlSNR.sh b/snmp/Openwrt/wlSNR.sh
index 006cae071..9980db9b8 100755
--- a/snmp/Openwrt/wlSNR.sh
+++ b/snmp/Openwrt/wlSNR.sh
@@ -15,15 +15,40 @@ fi
 
 # Calculate result. Sum just for debug, and return integer (safest / easiest)
 snrlist=$(/usr/bin/iwinfo "$1" assoclist 2>/dev/null | /usr/bin/cut -s -d "/" -f 2 | /usr/bin/cut -s -d "(" -f 2 | /usr/bin/cut -s -d " " -f 2 | /usr/bin/cut -s -d ")" -f 1)
-if [ "$2" = "sum" ]; then
-  result=$(/bin/echo "$snrlist" | /usr/bin/awk -F ':' '{sum += $1} END {printf "%d\n", sum}')
-elif [ "$2" = "avg" ]; then
-  result=$(/bin/echo "$snrlist" | /usr/bin/awk -F ':' '{sum += $1} END {printf "%d\n", sum/NR}')
-elif [ "$2" = "min" ]; then
-  result=$(/bin/echo "$snrlist" | /usr/bin/awk -F ':' 'NR == 1 || $1 < min {min = $1} END {printf "%d\n", min}')
-elif [ "$2" = "max" ]; then
-  result=$(/bin/echo "$snrlist" | /usr/bin/awk -F ':' 'NR == 1 || $1 > max {max = $1} END {printf "%d\n", max}')
+
+# Fallback for client-mode interfaces where assoclist is empty.
+if [ -z "$snrlist" ]; then
+  snrlist=$(/usr/bin/iwinfo "$1" info 2>/dev/null | awk '
+    /Signal:[[:space:]]*-?[0-9]+[[:space:]]*dBm/ && /Noise:[[:space:]]*-?[0-9]+[[:space:]]*dBm/ {
+      signal = ""
+      noise = ""
+      for (i = 1; i <= NF; i++) {
+        if ($i == "Signal:") {
+          signal = $(i+1)
+        }
+        if ($i == "Noise:") {
+          noise = $(i+1)
+        }
+      }
+      if (signal != "" && noise != "") {
+        print signal - noise
+      }
+      exit
+    }
+  ')
 fi
 
-# Return snmp result
-echo "$result"
+min_snr=$(/bin/echo "$snrlist" | awk 'NR==1{min=$1} $1<min{min=$1} END{printf "%d\n", (min=="" ? 0 : min)}')
+avg_snr=$(/bin/echo "$snrlist" | awk '{sum+=$1; n++} END{printf "%d\n", (n>0 ? sum/n : 0)}')
+max_snr=$(/bin/echo "$snrlist" | awk '$1>max{max=$1} END{printf "%d\n", (max=="" ? 0 : max)}')
+
+case "$2" in
+  min) echo "$min_snr" ;;
+  avg) echo "$avg_snr" ;;
+  max) echo "$max_snr" ;;
+  *)   echo "0" ;;
+esac
+
+# Second line for nsExtendOutputFull compatibility
+echo "# wlSNR $1 $2"
+exit 0