aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Štetiar <ynezz@true.cz>2019-05-17 10:53:18 +0200
committerPetr Štetiar <ynezz@true.cz>2019-05-20 21:19:48 +0200
commitaac8b52184e727d8ba7a13917a9a3c8b82ec4aa2 (patch)
treeae7bb4a8f8578265660fbb8dab4f73b75b80ec97
parent2c26dc7b411e0b3d98bba2751b52878f5c89db5b (diff)
downloadupstream-aac8b52184e727d8ba7a13917a9a3c8b82ec4aa2.tar.gz
upstream-aac8b52184e727d8ba7a13917a9a3c8b82ec4aa2.tar.bz2
upstream-aac8b52184e727d8ba7a13917a9a3c8b82ec4aa2.zip
base-files: add support for the new ar8xxx MIB counters settings
Commit "generic: ar8216: add mib_poll_interval switch attribute" has added mib_poll_interval global config option and commit "generic: ar8216: group MIB counters and use two basic ones only by default" has added mib_type config option. So this patch adds ucidef_set_ar8xxx_switch_mib helper function which would allow configuration of the above mentioned new switch config options. Signed-off-by: Petr Štetiar <ynezz@true.cz>
-rwxr-xr-xpackage/base-files/files/bin/config_generate5
-rwxr-xr-xpackage/base-files/files/lib/functions/uci-defaults.sh13
2 files changed, 17 insertions, 1 deletions
diff --git a/package/base-files/files/bin/config_generate b/package/base-files/files/bin/config_generate
index df221cc26c..3ca035ca8b 100755
--- a/package/base-files/files/bin/config_generate
+++ b/package/base-files/files/bin/config_generate
@@ -213,7 +213,8 @@ generate_switch() {
json_select switch
json_select "$key"
- json_get_vars enable reset blinkrate cpu_port
+ json_get_vars enable reset blinkrate cpu_port \
+ ar8xxx_mib_type ar8xxx_mib_poll_interval
uci -q batch <<-EOF
add network switch
@@ -221,6 +222,8 @@ generate_switch() {
set network.@switch[-1].reset='$reset'
set network.@switch[-1].enable_vlan='$enable'
set network.@switch[-1].blinkrate='$blinkrate'
+ set network.@switch[-1].ar8xxx_mib_type='$ar8xxx_mib_type'
+ set network.@switch[-1].ar8xxx_mib_poll_interval='$ar8xxx_mib_poll_interval'
EOF
generate_switch_vlans_ports "$1"
diff --git a/package/base-files/files/lib/functions/uci-defaults.sh b/package/base-files/files/lib/functions/uci-defaults.sh
index 315df7b708..1d57de5a70 100755
--- a/package/base-files/files/lib/functions/uci-defaults.sh
+++ b/package/base-files/files/lib/functions/uci-defaults.sh
@@ -182,6 +182,19 @@ _ucidef_finish_switch_roles() {
done
}
+ucidef_set_ar8xxx_switch_mib() {
+ local name="$1"
+ local type="$2"
+ local interval="$3"
+
+ json_select_object switch
+ json_select_object "$name"
+ json_add_int ar8xxx_mib_type $type
+ json_add_int ar8xxx_mib_poll_interval $interval
+ json_select ..
+ json_select ..
+}
+
ucidef_add_switch() {
local name="$1"; shift
local port num role device index need_tag prev_role