diff options
| author | Rasmus Villemoes <rasmus.villemoes@prevas.dk> | 2019-05-29 07:02:11 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-04 08:01:27 +0200 |
| commit | 69aa2dc9a9f42e741fc8ce8915071e4883b201c2 (patch) | |
| tree | c0f1ade1a2d2ae206af676337b8ba665afce9aa7 | |
| parent | d07907f584b80803691b91d58c46aa2e5d9d0ef3 (diff) | |
| download | linux-stable-69aa2dc9a9f42e741fc8ce8915071e4883b201c2.tar.gz linux-stable-69aa2dc9a9f42e741fc8ce8915071e4883b201c2.tar.bz2 linux-stable-69aa2dc9a9f42e741fc8ce8915071e4883b201c2.zip | |
net: dsa: mv88e6xxx: fix handling of upper half of STATS_TYPE_PORT
[ Upstream commit 84b3fd1fc9592d431e23b077e692fa4e3fd0f086 ]
Currently, the upper half of a 4-byte STATS_TYPE_PORT statistic ends
up in bits 47:32 of the return value, instead of bits 31:16 as they
should.
Fixes: 6e46e2d821bb ("net: dsa: mv88e6xxx: Fix u64 statistics")
Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
Reviewed-by: Vivien Didelot <vivien.didelot@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/net/dsa/mv88e6xxx/chip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c index 6cba05a80892..5a81ce42b808 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -892,7 +892,7 @@ static uint64_t _mv88e6xxx_get_ethtool_stat(struct mv88e6xxx_chip *chip, err = mv88e6xxx_port_read(chip, port, s->reg + 1, ®); if (err) return U64_MAX; - high = reg; + low |= ((u32)reg) << 16; } break; case STATS_TYPE_BANK1: |