projects
/
openwrt
/
svn-archive
/
archive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bcm53xx: try to handle Netgear R8000 VLANs config
[openwrt/svn-archive/archive.git]
/
target
/
linux
/
bcm53xx
/
base-files
/
etc
/
uci-defaults
/
02_network
diff --git
a/target/linux/bcm53xx/base-files/etc/uci-defaults/02_network
b/target/linux/bcm53xx/base-files/etc/uci-defaults/02_network
index 5886bd2d985d71462e53a6e6deb7e9b5f1af9692..9ffb427d1c4aec3ff976cbcbeff9a53135166735 100644
(file)
--- a/
target/linux/bcm53xx/base-files/etc/uci-defaults/02_network
+++ b/
target/linux/bcm53xx/base-files/etc/uci-defaults/02_network
@@
-20,7
+20,14
@@
if echo "$vlan1ports" | egrep -q "^1 2 3 4 5" && \
echo "$vlan2ports" | egrep -q "^0 5"; then
ucidef_add_switch_vlan "switch0" "1" "1 2 3 4 5t"
ucidef_add_switch_vlan "switch0" "2" "0 5t"
echo "$vlan2ports" | egrep -q "^0 5"; then
ucidef_add_switch_vlan "switch0" "1" "1 2 3 4 5t"
ucidef_add_switch_vlan "switch0" "2" "0 5t"
+elif echo "$vlan1ports" | egrep -q "^0 1 2 3 5 7 8" && \
+ echo "$vlan2ports" | egrep -q "^4 8"; then
+ ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 5 7 8t"
+ ucidef_add_switch_vlan "switch0" "2" "4 8t"
else
else
+ # This also handles some funcy (e.g. R6250) configs like:
+ # vlan1ports=3 2 1 0 5*
+ # vlan2ports=4 5u
ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 5t"
ucidef_add_switch_vlan "switch0" "2" "4 5t"
fi
ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 5t"
ucidef_add_switch_vlan "switch0" "2" "4 5t"
fi