summaryrefslogtreecommitdiff
path: root/target/linux/bcm53xx/base-files
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2015-12-03 17:30:24 +0000
committerJo-Philipp Wich <jow@openwrt.org>2015-12-03 17:30:24 +0000
commit9b02e73188158829d48835906edbb8702fd95e28 (patch)
treef7592cc1db8ad3aac0040b011b106c73048acb97 /target/linux/bcm53xx/base-files
parentd17a64c7c01e2f0bb79123250ec6ea5f4fb8ec6e (diff)
downloadmtk-20170518-9b02e73188158829d48835906edbb8702fd95e28.zip
mtk-20170518-9b02e73188158829d48835906edbb8702fd95e28.tar.gz
mtk-20170518-9b02e73188158829d48835906edbb8702fd95e28.tar.bz2
board.d: merge ucidef_add_switch() and ucidef_add_switch_ports()
This changes uci-defaults-new.sh, config_generate and all relevant board.d files in order combine ucidef_add_switch() and ucidef_add_switch_ports() into a single function. Also removes now superfluous enable and reset arguments. Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> SVN-Revision: 47721
Diffstat (limited to 'target/linux/bcm53xx/base-files')
-rwxr-xr-xtarget/linux/bcm53xx/base-files/etc/board.d/02_network11
1 files changed, 5 insertions, 6 deletions
diff --git a/target/linux/bcm53xx/base-files/etc/board.d/02_network b/target/linux/bcm53xx/base-files/etc/board.d/02_network
index 338e711..5abb061 100755
--- a/target/linux/bcm53xx/base-files/etc/board.d/02_network
+++ b/target/linux/bcm53xx/base-files/etc/board.d/02_network
@@ -29,12 +29,11 @@ esac
ucidef_set_interface_loopback
ucidef_set_interfaces_lan_wan "$ifname.1" "$ifname.2"
-ucidef_add_switch "switch0" "1" "1"
# Workaround for devices using CPU port 8 (connected to eth2)
case "$board" in
netgear,r8000)
- ucidef_add_switch_ports "switch0" \
+ ucidef_add_switch "switch0" \
"0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "5t@$ifname"
board_config_flush
exit 0
@@ -50,18 +49,18 @@ vlan1ports="$(echo $(nvram get vlan1ports | tr " " "\n" | sort))"
vlan2ports="$(echo $(nvram get vlan2ports | tr " " "\n" | sort))"
if echo "$vlan1ports" | egrep -q "^1 2 3 4 5" && \
echo "$vlan2ports" | egrep -q "^0 5"; then
- ucidef_add_switch_ports "switch0" \
+ ucidef_add_switch "switch0" \
"1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "5t@$ifname"
elif echo "$vlan1ports" | egrep -q "^1 2 3 5 7" && \
echo "$vlan2ports" | egrep -q "^0 7"; then
- ucidef_add_switch_ports "switch0" \
+ ucidef_add_switch "switch0" \
"1:lan" "2:lan" "3:lan" "5:lan" "0:wan" "7t@$ifname"
elif echo "$vlan1ports" | egrep -q "^0 1 2 3 5 7 8" && \
echo "$vlan2ports" | egrep -q "^4 8"; then
- ucidef_add_switch_ports "switch0" \
+ ucidef_add_switch "switch0" \
"0:lan" "1:lan" "2:lan" "3:lan" "5:lan" "7:lan" "4:wan" "8t@$ifname"
else
- ucidef_add_switch_ports "switch0" \
+ ucidef_add_switch "switch0" \
"0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "5t@$ifname"
fi