]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
net: bridge: add missing counters to ndo_get_stats64 callback
authorHeiner Kallweit <hkallweit1@gmail.com>
Fri, 13 Nov 2020 09:27:27 +0000 (10:27 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 24 Nov 2020 12:38:47 +0000 (13:38 +0100)
[ Upstream commit 7a30ecc9237681bb125cbd30eee92bef7e86293d ]

In br_forward.c and br_input.c fields dev->stats.tx_dropped and
dev->stats.multicast are populated, but they are ignored in
ndo_get_stats64.

Fixes: 28172739f0a2 ("net: fix 64 bit counters on 32 bit arches")
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Link: https://lore.kernel.org/r/58ea9963-77ad-a7cf-8dfd-fc95ab95f606@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/bridge/br_device.c

index 9a2fb4aa1a10e186e62a905429d7216a2ec20c0e..050fa0b6415d5e7e43306c048caabcd15656e360 100644 (file)
@@ -223,6 +223,7 @@ static void br_get_stats64(struct net_device *dev,
                sum.rx_packets += tmp.rx_packets;
        }
 
+       netdev_stats_to_stats64(stats, &dev->stats);
        stats->tx_bytes   = sum.tx_bytes;
        stats->tx_packets = sum.tx_packets;
        stats->rx_bytes   = sum.rx_bytes;