cleanup ucidef_set_interface* usage
authorMathias Kresin <dev@kresin.me>
Sat, 10 Sep 2016 07:46:14 +0000 (09:46 +0200)
committerMathias Kresin <dev@kresin.me>
Sat, 10 Sep 2016 13:32:25 +0000 (15:32 +0200)
- 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>
target/linux/ar71xx/base-files/etc/board.d/02_network
target/linux/kirkwood/base-files/etc/board.d/02_network
target/linux/lantiq/base-files/etc/board.d/02_network
target/linux/mpc85xx/base-files/etc/board.d/02_network
target/linux/oxnas/base-files/etc/board.d/02_network
target/linux/ramips/base-files/etc/board.d/02_network

index f185e05..b637113 100755 (executable)
@@ -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"
        ;;
 
index bf966e1..678fe99 100755 (executable)
@@ -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
 
index c2ccf97..dad4458 100755 (executable)
@@ -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
 
index c9645ab..e0a0861 100755 (executable)
@@ -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"
index d4010e8..ac7fa0a 100755 (executable)
@@ -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
 
index 772f5e1..675dcc9 100755 (executable)
@@ -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