net: bridge: add missing counters to ndo_get_stats64 callback

[ 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>

diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c
index 3d462fee9ed752878680264744875fc95444d6ac..06e88c6bb511545b7e1aef3471d4e49020e0b4d8 100644 (file)
--- a/net/bridge/br_device.c
+++ b/net/bridge/br_device.c
@@ -166,6 +166,7 @@ static struct rtnl_link_stats64 *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;