From: Eric Dumazet Date: Thu, 21 Sep 2023 08:52:16 +0000 (+0000) Subject: net: add DEV_STATS_READ() helper X-Git-Tag: v5.15.139~193 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3eedc19a9d0f522350b7fbd3d50eeb0e9a2885b7;p=thirdparty%2Fkernel%2Fstable.git net: add DEV_STATS_READ() helper [ Upstream commit 0b068c714ca9479d2783cc333fff5bc2d4a6d45c ] Companion of DEV_STATS_INC() & DEV_STATS_ADD(). This is going to be used in the series. Use it in macsec_get_stats64(). Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller Stable-dep-of: ff672b9ffeb3 ("ipvlan: properly track tx_errors") Signed-off-by: Sasha Levin --- diff --git a/drivers/net/macsec.c b/drivers/net/macsec.c index 07c822c301185..ab134fe1fda62 100644 --- a/drivers/net/macsec.c +++ b/drivers/net/macsec.c @@ -3681,9 +3681,9 @@ static void macsec_get_stats64(struct net_device *dev, dev_fetch_sw_netstats(s, dev->tstats); - s->rx_dropped = atomic_long_read(&dev->stats.__rx_dropped); - s->tx_dropped = atomic_long_read(&dev->stats.__tx_dropped); - s->rx_errors = atomic_long_read(&dev->stats.__rx_errors); + s->rx_dropped = DEV_STATS_READ(dev, rx_dropped); + s->tx_dropped = DEV_STATS_READ(dev, tx_dropped); + s->rx_errors = DEV_STATS_READ(dev, rx_errors); } static int macsec_get_iflink(const struct net_device *dev) diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 132f4344fee9f..829ebde5d50d5 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -5499,5 +5499,6 @@ extern struct net_device *blackhole_netdev; #define DEV_STATS_INC(DEV, FIELD) atomic_long_inc(&(DEV)->stats.__##FIELD) #define DEV_STATS_ADD(DEV, FIELD, VAL) \ atomic_long_add((VAL), &(DEV)->stats.__##FIELD) +#define DEV_STATS_READ(DEV, FIELD) atomic_long_read(&(DEV)->stats.__##FIELD) #endif /* _LINUX_NETDEVICE_H */