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 ee690f63758ec713ab51822db6f9bd9eba387fd7..c54d46c2db42b4452991291d9e27e5a674dd5573 100755 (executable)
--- 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|\