diff options
| author | Stephane Contri <Stephane.Contri@grassvalley.com> | 2009-07-03 01:26:48 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-06 03:03:35 +0200 |
| commit | 1ded3f59f35a2642852b3e2a1c0fa8a97777e9af (patch) | |
| tree | 8740ddef72d2a51849cf87fc30744dcda04864f0 /net/dsa/mv88e6xxx.c | |
| parent | forcedeth: Fix NAPI race. (diff) | |
| download | linux-1ded3f59f35a2642852b3e2a1c0fa8a97777e9af.tar.xz linux-1ded3f59f35a2642852b3e2a1c0fa8a97777e9af.zip | |
dsa: fix 88e6xxx statistics counter snapshotting
The bit that tells us whether a statistics counter snapshot operation
has completed is located in the GLOBAL register block, not in the
GLOBAL2 register block, so fix up mv88e6xxx_stats_wait() to poll the
right register address.
Signed-off-by: Stephane Contri <Stephane.Contri@grassvalley.com>
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Cc: stable@kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dsa/mv88e6xxx.c')
| -rw-r--r-- | net/dsa/mv88e6xxx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/dsa/mv88e6xxx.c b/net/dsa/mv88e6xxx.c index 4e4d8b5ad03d..efe661a9def4 100644 --- a/net/dsa/mv88e6xxx.c +++ b/net/dsa/mv88e6xxx.c @@ -418,7 +418,7 @@ static int mv88e6xxx_stats_wait(struct dsa_switch *ds) int i; for (i = 0; i < 10; i++) { - ret = REG_READ(REG_GLOBAL2, 0x1d); + ret = REG_READ(REG_GLOBAL, 0x1d); if ((ret & 0x8000) == 0) return 0; } |