Commit cb7655a9 authored Oct 12, 2023 by Greg Kroah-Hartman

Revert "net: Fix unwanted sign extension in netdev_stats_to_stats64()"



This reverts commit b17d81b9 which is
commit 9b55d3f0a69af649c62cbc2633e6d695bb3cc583 upstream.

It is needed to be reverted as it relies on an abi-breaking change that
also must be reverted.  It's not really needed for Android systems, but
if it is needed to come back, it can be reworked to be a CRC-abi neutral
change if so desired.

Bug: 161946584
Change-Id: I375a29e01f3758f89f74bea69183e3990e01043c
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

parent 1b368741

net/core/dev.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -9056,7 +9056,7 @@ void netdev_stats_to_stats64(struct rtnl_link_stats64 *stats64,

		BUILD_BUG_ON(n > sizeof(*stats64) / sizeof(u64));
		for (i = 0; i < n; i++)
		dst[i] = (unsigned long)atomic_long_read(&src[i]);
		dst[i] = atomic_long_read(&src[i]);
		/* zero out counters that only exist in rtnl_link_stats64 */
		memset((char )stats64 + n sizeof(u64), 0,
		sizeof(stats64) - n sizeof(u64));