rpcd: iwinfo plugin fixes

[openwrt/svn-archive/archive.git] / package / base-files / files / lib / functions / uci-defaults.sh

diff --git a/package/base-files/files/lib/functions/uci-defaults.sh b/package/base-files/files/lib/functions/uci-defaults.sh
index d556844e95c021ce23d5cbc7cb60e975abb5035e..b097fba37cbc175240b4dabffe74b990b0196c14 100755 (executable)
--- a/package/base-files/files/lib/functions/uci-defaults.sh
+++ b/package/base-files/files/lib/functions/uci-defaults.sh
@@ -89,6 +89,12 @@ ucidef_set_interfaces_lan_wan() {
        json_select ..
 }
 
+ucidef_set_interface_raw() {
+       json_select_object network
+       _ucidef_set_interface "$@"
+       json_select ..
+}
+
 _ucidef_add_switch_port() {
        # inherited: $num $device $need_tag $role $index $prev_role
        # inherited: $n_cpu $n_ports $n_vlan $cpu0 $cpu1 $cpu2 $cpu3 $cpu4 $cpu5
@@ -335,15 +341,13 @@ ucidef_add_adsl_modem() {
 
 ucidef_add_vdsl_modem() {
        local annex="$1"
-       local firmware="$2"
-       local tone="$3"
-       local xfer_mode="$4"
+       local tone="$2"
+       local xfer_mode="$3"
 
        json_select_object dsl
                json_select_object modem
                        json_add_string type "vdsl"
                        json_add_string annex "$annex"
-                       json_add_string firmware "$firmware"
                        json_add_string tone "$tone"
                        json_add_string xfer_mode "$xfer_mode"
                json_select ..
@@ -355,6 +359,7 @@ ucidef_set_led_netdev() {
        local name="$2"
        local sysfs="$3"
        local dev="$4"
+       local mode="${5:-link tx rx}"
 
        json_select_object led
 
@@ -363,6 +368,7 @@ ucidef_set_led_netdev() {
        json_add_string type netdev
        json_add_string sysfs "$sysfs"
        json_add_string device "$dev"
+       json_add_string mode "$mode"
        json_select ..
 
        json_select ..