From bfa8064ccdf5fb7e342e3979b2a569a6979afbc5 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sun, 22 Mar 2009 20:19:23 +0000 Subject: atheros: in later kernels, vlan 0 no longer works as expected, switch to (1,2) instead of (0,1) for lan/wan SVN-Revision: 14981 --- target/linux/generic-2.6/files/drivers/net/phy/mvswitch.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'target/linux/generic-2.6/files/drivers/net') diff --git a/target/linux/generic-2.6/files/drivers/net/phy/mvswitch.c b/target/linux/generic-2.6/files/drivers/net/phy/mvswitch.c index 427bad4050..9a85411e0e 100644 --- a/target/linux/generic-2.6/files/drivers/net/phy/mvswitch.c +++ b/target/linux/generic-2.6/files/drivers/net/phy/mvswitch.c @@ -32,7 +32,7 @@ /* Undefine this to use trailer mode instead. * I don't know if header mode works with all chips */ -#define HEADER_MODE 1 +//#define HEADER_MODE 1 MODULE_DESCRIPTION("Marvell 88E6060 Switch driver"); MODULE_AUTHOR("Felix Fietkau"); @@ -251,7 +251,7 @@ mvswitch_config_init(struct phy_device *pdev) /* initialize default vlans */ for (i = 0; i < MV_PORTS; i++) - priv->vlans[(i == MV_WANPORT ? 1 : 0)] |= (1 << i); + priv->vlans[(i == MV_WANPORT ? 2 : 1)] |= (1 << i); /* before entering reset, disable all ports */ for (i = 0; i < MV_PORTS; i++) @@ -422,7 +422,9 @@ mvswitch_fixup(struct phy_device *dev) { u16 reg; - /* look for the switch on the bus */ + if (dev->addr != 0x10) + return 0; + reg = dev->bus->read(dev->bus, MV_PORTREG(IDENT, 0)) & MV_IDENT_MASK; if (reg != MV_IDENT_VALUE) return 0; -- cgit v1.2.3