Author: rmilecki Date: 2015-04-24 09:47:25 +0200 (Fri, 24 Apr 2015) New Revision: 45575
Modified: trunk/target/linux/bcm53xx/base-files/etc/board.d/02_network Log: bcm53xx: sort ports from NVRAM entries before matching them Some devices have unsorted ports which may lead to broken config. Signed-off-by: Rafa?\197?\130 Mi?\197?\130ecki <[email protected]> Modified: trunk/target/linux/bcm53xx/base-files/etc/board.d/02_network =================================================================== --- trunk/target/linux/bcm53xx/base-files/etc/board.d/02_network 2015-04-23 22:31:36 UTC (rev 45574) +++ trunk/target/linux/bcm53xx/base-files/etc/board.d/02_network 2015-04-24 07:47:25 UTC (rev 45575) @@ -12,8 +12,13 @@ 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 @@ 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 _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
