Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76304c74 authored by Eric Dumazet's avatar Eric Dumazet Committed by Greg Kroah-Hartman
Browse files

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: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Stable-dep-of: ff672b9ffeb3 ("ipvlan: properly track tx_errors")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 4482b250

drivers/net/macsec.c

+3 −3
Original line number Diff line number Diff line
@@ -2995,9 +2995,9 @@ static void macsec_get_stats64(struct net_device *dev, 
		s->tx_bytes   += tmp.tx_bytes;

	}



	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)

include/linux/netdevice.h

+1 −0
Original line number Diff line number Diff line
@@ -4966,5 +4966,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 */