bcm53xx: sort ports from NVRAM entries before matching them

[openwrt.git] / target / linux / bcm53xx / base-files / etc / board.d / 02_network

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 c36b47c..644d3d9 100755 (executable)
--- 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