Commit 566dc17b authored May 29, 2019 by Rasmus Villemoes Committed by Greg Kroah-Hartman Jun 04, 2019

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>

parent 2d04f32c

drivers/net/dsa/mv88e6xxx/chip.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -877,7 +877,7 @@ static uint64_t _mv88e6xxx_get_ethtool_stat(struct mv88e6xxx_chip *chip,
		err = mv88e6xxx_port_read(chip, port, s->reg + 1, &reg);
		if (err)
		return U64_MAX;
		high = reg;
		low \|= ((u32)reg) << 16;
		}
		break;
		case STATS_TYPE_BANK1: