aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2015-04-24 07:47:25 +0000
committerRafał Miłecki <zajec5@gmail.com>2015-04-24 07:47:25 +0000
commit33e597b2417e2bc12559333f1c5374778935a8e1 (patch)
tree50d0e5878eb7d0dcd211cc7f0a340ad0a4f4cccc /target
parent00fb1bc0982f6b0b2d0db2d3776e8262c6169eb0 (diff)
downloadupstream-33e597b2417e2bc12559333f1c5374778935a8e1.tar.gz
upstream-33e597b2417e2bc12559333f1c5374778935a8e1.tar.bz2
upstream-33e597b2417e2bc12559333f1c5374778935a8e1.zip
bcm53xx: sort ports from NVRAM entries before matching them
Some devices have unsorted ports which may lead to broken config. Signed-off-by: Rafał Miłecki <zajec5@gmail.com> SVN-Revision: 45575
Diffstat (limited to 'target')
-rwxr-xr-xtarget/linux/bcm53xx/base-files/etc/board.d/02_network12
1 files changed, 7 insertions, 5 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 c36b47ca4d..644d3d9bb9 100755
--- a/target/linux/bcm53xx/base-files/etc/board.d/02_network
+++ b/target/linux/bcm53xx/base-files/etc/board.d/02_network
@@ -12,8 +12,13 @@ ucidef_set_interface_loopback
ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
ucidef_add_switch "switch0" "1" "1"
-vlan1ports="$(nvram get vlan1ports)"
-vlan2ports="$(nvram get vlan2ports)"
+# NVRAM entries may contain unsorted ports, e.g. Netgear R6250 uses
+# vlan1ports=3 2 1 0 5*
+# vlan2ports=4 5u
+# and early Netgear R8000 was using
+# vlan1ports=3 2 1 0 5 7 8*
+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_vlan "switch0" "1" "1 2 3 4 5t"
@@ -23,9 +28,6 @@ elif echo "$vlan1ports" | egrep -q "^0 1 2 3 5 7 8" && \
ucidef_add_switch_vlan "switch0" "1" "0 1 2 3 5 7 8t"
ucidef_add_switch_vlan "switch0" "2" "4 8t"
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