From dcca036f6f356ac0a99895133ce4af0c278a3ac9 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Thu, 25 Feb 2016 10:14:22 +0000 Subject: [PATCH] ramips: mt7620: fix failsafe switch config As indicated in the bug tracker[1], failsafe mode is broken on at least some devices using the mt7620 switch (and possibly mt7621). The thread explicitly mentions the Xiaomi MiWifi, and the Nexx WT3020, and an unspecified device using the mt7621 switch; the issue also applies to the Netgear EX2700. The problem is that failsafe mode uses eth0, but enable_vlan is always set to 1 by the switch driver. Connecting to and/or pinging the device fails. This patch fixes the failsafe preinit config, by making sure that vlan support is disabled. It currently only fixes the switch config on mt7620, but might apply to the mt7621 as well, so the patch has been designed with this in mind. A similar (line wrapped) patch was submitted in December by Simon Peter, but never accepted and/or discussed. This patch applies to both Chaos Calmer and trunk. [1] https://dev.openwrt.org/ticket/18768 Signed-off-by: Joseph C. Lehner SVN-Revision: 48772 --- .../lib/preinit/07_set_preinit_iface_ramips | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/target/linux/ramips/base-files/lib/preinit/07_set_preinit_iface_ramips b/target/linux/ramips/base-files/lib/preinit/07_set_preinit_iface_ramips index 3dce1b667b..6948851ee5 100644 --- a/target/linux/ramips/base-files/lib/preinit/07_set_preinit_iface_ramips +++ b/target/linux/ramips/base-files/lib/preinit/07_set_preinit_iface_ramips @@ -7,8 +7,22 @@ ramips_set_preinit_iface() { RT3X5X=`cat /proc/cpuinfo | egrep "(RT3.5|RT5350|MT7628|MT7688)"` + MT762X=`cat /proc/cpuinfo | egrep "MT7620"` + if [ -n "${RT3X5X}" ]; then swconfig dev rt305x set reset 1 + elif [ -n "${MT762X}" ]; then + # The mt7530 switch driver enables VLAN by default, but + # failsafe uses eth0, making the device unreachable: + # https://dev.openwrt.org/ticket/18768 + case "${MT762X}" in + *MT7620*) + mt762x_switchdev=mt7620 + ;; + esac + swconfig dev $mt762x_switchdev set reset 1 + swconfig dev $mt762x_switchdev set enable_vlan 0 + swconfig dev $mt762x_switchdev set apply 1 fi if echo $RT3X5X | egrep -q "(RT5350|MT7628|MT7688)"; then -- 2.30.2