android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "ip_tunnels: use DEV_STATS_INC()"

Browse Source 
This reverts commit 62c363e604 which is
commit 9b271ebaf9a2c5c566a54bc6cd915962e8241130 upstream.

It breaks the build due to a previous commit that was reverted for
Android ABI issues.  If this needs to be added, it can be done so in the
future in an abi-safe way.

Bug: 161946584
Change-Id: I016ca3ddfafde35fe1b91876d3e9536fdbd00320
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman 2023-09-19 12:22:58 +00:00
parent 2b44f56202
commit 4d59a2c9b9
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/net/ip_tunnels.h
View File

@ -449,14 +449,15 @@ static inline void iptunnel_xmit_stats(struct net_device *dev, int pkt_len)
tstats->tx_packets++;
u64_stats_update_end(&tstats->syncp);
put_cpu_ptr(tstats);
return;
}
if (pkt_len < 0) {
DEV_STATS_INC(dev, tx_errors);
DEV_STATS_INC(dev, tx_aborted_errors);
} else {
DEV_STATS_INC(dev, tx_dropped);
struct net_device_stats *err_stats = &dev->stats;
if (pkt_len < 0) {
err_stats->tx_errors++;
err_stats->tx_aborted_errors++;
} else {
err_stats->tx_dropped++;
}
}
}