]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
dsa: fix 88e6xxx statistics counter snapshotting
authorStephane Contri <Stephane.Contri@grassvalley.com>
Thu, 2 Jul 2009 23:26:48 +0000 (23:26 +0000)
committerDavid S. Miller <davem@davemloft.net>
Mon, 6 Jul 2009 01:03:35 +0000 (18:03 -0700)
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>
net/dsa/mv88e6xxx.c

index 4e4d8b5ad03d3b58fe6c0e353e147b2b78fa5144..efe661a9def4db3644d0e8402e2b00295a3cd0c6 100644 (file)
@@ -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;
        }