diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-03-22 20:19:23 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-03-22 20:19:23 +0000 |
| commit | 6623e9fd706ad3c7351e376b065b04c6e1595062 (patch) | |
| tree | e4c519a417db9b915b602e6217530958792351aa /target/linux/generic-2.6/files/drivers/net | |
| parent | 6417f404c65afec3c0d0fcb787873585f0d4e813 (diff) | |
atheros: in later kernels, vlan 0 no longer works as expected, switch to (1,2) instead of (0,1) for lan/wan
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14981 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/files/drivers/net')
| -rw-r--r-- | target/linux/generic-2.6/files/drivers/net/phy/mvswitch.c | 8 |
1 files changed, 5 insertions, 3 deletions
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 427bad405..9a85411e0 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; |