[source] cleanup ucidef_set_interface* usage
LEDE Commits
lede-commits at lists.infradead.org
Sat Sep 10 06:40:21 PDT 2016
mkresin pushed a commit to source.git, branch master:
https://git.lede-project.org/c1578d4fc9e53c9b80d858fc924adc8a66f5fce3
commit c1578d4fc9e53c9b80d858fc924adc8a66f5fce3
Author: Mathias Kresin <dev at kresin.me>
AuthorDate: Sat Sep 10 09:46:14 2016 +0200
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 at kresin.me>
---
target/linux/ar71xx/base-files/etc/board.d/02_network | 3 +--
target/linux/kirkwood/base-files/etc/board.d/02_network | 2 +-
target/linux/lantiq/base-files/etc/board.d/02_network | 4 ++--
target/linux/mpc85xx/base-files/etc/board.d/02_network | 2 +-
target/linux/oxnas/base-files/etc/board.d/02_network | 2 +-
target/linux/ramips/base-files/etc/board.d/02_network | 4 ++--
6 files changed, 8 insertions(+), 9 deletions(-)
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 f185e05..b637113 100755
--- 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 at 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 bf966e1..678fe99 100755
--- 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 c2ccf97..dad4458 100755
--- 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 c9645ab..e0a0861 100755
--- 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 at 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 d4010e8..ac7fa0a 100755
--- 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 772f5e1..675dcc9 100755
--- 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
More information about the lede-commits
mailing list