diff options
| author |   Vivien Didelot <vivien.didelot@savoirfairelinux.com> | 2015-04-20 17:19:23 -0400 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-04-20 22:01:15 -0400 |
| commit | 614f03fc6a897d212546a93f50d449409215dfd4 (patch) | |
| tree | 6a99f6e807c64dae4cec768def2d4b972248fdd6 | |
| parent | Merge branch 'ppp_csum_unset' (diff) | |
| download | linux-dev-614f03fc6a897d212546a93f50d449409215dfd4.tar.xz linux-dev-614f03fc6a897d212546a93f50d449409215dfd4.zip | |
net: dsa: mv88e6xxx: fix setup of port control 1
mv88e6xxx_setup_port_common was writing to PORT_DEFAULT_VLAN (port
offset 0x07) instead of PORT_CONTROL_1 (port offset 0x05).
Fixes: cca8b1337541 ("net: dsa: Use mnemonics rather than register numbers")
Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/dsa/mv88e6xxx.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/dsa/mv88e6xxx.c b/drivers/net/dsa/mv88e6xxx.c index 9f0c2b9d58ae..48712bd630bb 100644 --- a/drivers/net/dsa/mv88e6xxx.c +++ b/drivers/net/dsa/mv88e6xxx.c @@ -1251,8 +1251,7 @@ int mv88e6xxx_setup_port_common(struct dsa_switch *ds, int port) /* Port Control 1: disable trunking, disable sending * learning messages to this port. */ - ret = _mv88e6xxx_reg_write(ds, REG_PORT(port), PORT_DEFAULT_VLAN, - 0x0000); + ret = _mv88e6xxx_reg_write(ds, REG_PORT(port), PORT_CONTROL_1, 0x0000); if (ret) goto abort; |