cleanup ucidef_set_interface* usage

- quote the interface name
- remove call of not existing function
- remove the proto if it's the default proto

Signed-off-by: Mathias Kresin <dev@kresin.me>

diff --git a/target/linux/ar71xx/base-files/etc/board.d/02_network b/target/linux/ar71xx/base-files/etc/board.d/02_network
index f185e059b228a6a03555f4152014b088ed30b736..b637113eff11fa549803eed6e96b659b4018ca05 100755 (executable)
--- a/target/linux/ar71xx/base-files/etc/board.d/02_network
+++ b/target/linux/ar71xx/base-files/etc/board.d/02_network
@@ -69,7 +69,6 @@ bsb)
        ucidef_set_interfaces_lan_wan "eth1" "eth0"
        ucidef_add_switch "switch0" \
                "0@eth1" "1:lan" "3:lan"  # XXX: confirm cpu port!
-       ucidef_set_interface_wlan
        ;;
 
 cpe210|\
@@ -194,7 +193,7 @@ el-m150)
        ;;
 
 tellstick-znet-lite)
-       ucidef_set_interface_wan "eth0" "dhcp"
+       ucidef_set_interface_wan "eth0"
        ucidef_set_interface_raw "wlan" "wlan0" "dhcp"
        ;;
 

diff --git a/target/linux/kirkwood/base-files/etc/board.d/02_network b/target/linux/kirkwood/base-files/etc/board.d/02_network
index bf966e1117ee0e67a1ff5ae097b080c9d8c6886e..678fe999152d1f8caa23f4b6640f279b038dd051 100755 (executable)
--- a/target/linux/kirkwood/base-files/etc/board.d/02_network
+++ b/target/linux/kirkwood/base-files/etc/board.d/02_network
@@ -36,7 +36,7 @@ case "$board" in
        ucidef_set_interface_lan "eth0" "dhcp"
        ;;
 *)
-       ucidef_set_interface_lan "eth0" "static"
+       ucidef_set_interface_lan "eth0"
        ;;
 esac
 

diff --git a/target/linux/lantiq/base-files/etc/board.d/02_network b/target/linux/lantiq/base-files/etc/board.d/02_network
index c2ccf97718dff29109da2fa657b5ad1f17eeeb1b..dad4458496e00cc9e62f82250dd93da940a08dda 100755 (executable)
--- a/target/linux/lantiq/base-files/etc/board.d/02_network
+++ b/target/linux/lantiq/base-files/etc/board.d/02_network
@@ -170,8 +170,8 @@ fi
 
 ucidef_set_interface_wan "$interface_wan" "pppoe"
 
-[ -n "$lan_mac" ] && ucidef_set_interface_macaddr lan "$lan_mac"
-[ -n "$wan_mac" ] && ucidef_set_interface_macaddr wan "$wan_mac"
+[ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" "$lan_mac"
+[ -n "$wan_mac" ] && ucidef_set_interface_macaddr "wan" "$wan_mac"
 
 board_config_flush
 

diff --git a/target/linux/mpc85xx/base-files/etc/board.d/02_network b/target/linux/mpc85xx/base-files/etc/board.d/02_network
index c9645abb7bd40b605555f6696a6d8b511c4e597b..e0a0861f3b023227580b12e4d893b1fa6137fab4 100755 (executable)
--- a/target/linux/mpc85xx/base-files/etc/board.d/02_network
+++ b/target/linux/mpc85xx/base-files/etc/board.d/02_network
@@ -14,7 +14,7 @@ case "$board" in
 tl-wdr4900-v1)
        ucidef_add_switch "switch0" \
                "0@eth0" "2:lan:1" "3:lan:2" "4:lan:3" "5:lan:4" "1:wan"
-       ucidef_set_interface_macaddr wan "$(mtd_get_mac_binary config 332)"
+       ucidef_set_interface_macaddr "wan" "$(mtd_get_mac_binary config 332)"
        ;;
 *)
        ucidef_set_interfaces_lan_wan "eth0" "eth1"

diff --git a/target/linux/oxnas/base-files/etc/board.d/02_network b/target/linux/oxnas/base-files/etc/board.d/02_network
index d4010e8b3a64aef884fe762f797bcf72b8d1b23d..ac7fa0a1f9de6a87c5efdecb2534de667bf4c524 100755 (executable)
--- a/target/linux/oxnas/base-files/etc/board.d/02_network
+++ b/target/linux/oxnas/base-files/etc/board.d/02_network
@@ -15,7 +15,7 @@ case "$(oxnas_board_name)" in
 esac
 
 ucidef_set_interface_lan "eth0" "dhcp"
-[ -n "$lan_mac" ] && ucidef_set_interface_macaddr lan "$lan_mac"
+[ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" "$lan_mac"
 
 board_config_flush
 

diff --git a/target/linux/ramips/base-files/etc/board.d/02_network b/target/linux/ramips/base-files/etc/board.d/02_network
index 772f5e10deae8ac8e1d52f258dc9f6675688cf8c..675dcc98323ea82aa9632ec0fddb624714697013 100755 (executable)
--- a/target/linux/ramips/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/base-files/etc/board.d/02_network
@@ -371,8 +371,8 @@ ramips_setup_macs()
                ;;
        esac
 
-       [ -n "$lan_mac" ] && ucidef_set_interface_macaddr lan $lan_mac
-       [ -n "$wan_mac" ] && ucidef_set_interface_macaddr wan $wan_mac
+       [ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" $lan_mac
+       [ -n "$wan_mac" ] && ucidef_set_interface_macaddr "wan" $wan_mac
 }
 
 board_config_update