From: Vittorio Gambaletta (VittGam) <openwrt@vittgam.net>
Date: Wed, 4 May 2016 19:21:41 +0000 (+0200)
Subject: ramips: Fix network for routers without VLANs on eth0.
X-Git-Tag: v17.01.0-rc1~2906
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ffb7bf7672ddf531497d1a81b7e969e43484ea0f;p=oweals%2Fopenwrt.git

ramips: Fix network for routers without VLANs on eth0.

Some routers only have one port, so eth0 is used without VLANs for them.

Revision r47720 introduced some changes, but wrongly confused "enable" with "reset".

VLANs need to be disabled for those routers, and the switch may be reset.

Fix this, by explicitly disabling VLANs instead of resetting the switch for these routers.

Also merge duplicate configuration for the "m2m".

Signed-off-by: Vittorio Gambaletta <openwrt@vittgam.net>
---

diff --git a/target/linux/ramips/base-files/etc/board.d/02_network b/target/linux/ramips/base-files/etc/board.d/02_network
index ee690f6375..c54d46c2db 100755
--- a/target/linux/ramips/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/base-files/etc/board.d/02_network
@@ -44,13 +44,14 @@ ramips_setup_interfaces()
 	ht-tm02|\
 	linkits7688 | \
 	linkits7688d | \
+	m2m|\
 	microwrt|\
 	ncs601w|\
 	w150m|\
 	wnce2001|\
 	zte-q7)
 		ucidef_add_switch "switch0"
-		ucidef_add_switch_attr "switch0" "reset" "false"
+		ucidef_add_switch_attr "switch0" "enable" "false"
 		ucidef_set_interface_lan "eth0"
 		;;
 	3g-6200nl|\
@@ -181,11 +182,6 @@ ramips_setup_interfaces()
 		ucidef_add_switch "switch0" \
 			"1:lan" "2:lan" "3:lan" "4:lan" "5:lan" "0:wan" "6@eth0"
 		;;
-	m2m)
-		ucidef_add_switch "switch0"
-		ucidef_add_switch_attr "switch0" "reset" "false"
-		ucidef_set_interface_lan "eth0"
-		;;
 	mlwg2|\
 	wizard8800|\
 	wl-330n|\