diff options
| author | Rasmus Villemoes <rasmus.villemoes@prevas.dk> | 2019-05-29 07:02:11 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-05-30 12:28:06 -0700 |
| commit | 84b3fd1fc9592d431e23b077e692fa4e3fd0f086 (patch) | |
| tree | 3a40501f7212eafc56b5a43d7268e434c668aa43 /drivers/net | |
| parent | 59715171fbd0172a579576f46821031800a63bc5 (diff) | |
| download | linux-84b3fd1fc9592d431e23b077e692fa4e3fd0f086.tar.bz2 | |
net: dsa: mv88e6xxx: fix handling of upper half of STATS_TYPE_PORT
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>
Diffstat (limited to 'drivers/net')
| -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 28414db979b0..12f165a71a6c 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c @@ -785,7 +785,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: |