Merge branch 'snmp-stats-update'

Eric Dumazet says: ==================== net: snmp: update SNMP methods In the old days (before linux-3.0), SNMP counters were duplicated, one set for user context, and anther one for BH context. After commit 8f0ea0fe3a ("snmp: reduce percpu needs by 50%") we have a single copy, and what really matters is preemption being enabled or disabled, since we use this_cpu_inc() or __this_cpu_inc() respectively. This patch series kills the obsolete STATS_USER() helpers, and rename all XXX_BH() helpers to __XXX() ones, to more closely match conventions used to update per cpu variables. This is probably going to hurt maintainers job for a while, since cherry-picks will not be clean, but this had to be cleaned at one point. I am so sorry guys. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
2026-09-28 19:20:30 +00:00 · 2016-04-27 22:48:25 -04:00 · 2016-04-27 22:48:25 -04:00 · 210732d16d
commit 210732d16d
parent 2995aea5b6 13415e46c5
54 changed files with 512 additions and 531 deletions
--- a/include/net/icmp.h
+++ b/include/net/icmp.h
--- a/include/net/ip.h
+++ b/include/net/ip.h
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
--- a/include/net/sctp/sctp.h
+++ b/include/net/sctp/sctp.h
--- a/include/net/snmp.h
+++ b/include/net/snmp.h
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
--- a/include/net/udp.h
+++ b/include/net/udp.h
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
--- a/net/bridge/br_netfilter_hooks.c
+++ b/net/bridge/br_netfilter_hooks.c
--- a/net/bridge/br_netfilter_ipv6.c
+++ b/net/bridge/br_netfilter_ipv6.c
--- a/net/core/dev.c
+++ b/net/core/dev.c
--- a/net/dccp/dccp.h
+++ b/net/dccp/dccp.h
--- a/net/dccp/input.c
+++ b/net/dccp/input.c
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
--- a/net/dccp/ipv6.c
+++ b/net/dccp/ipv6.c
--- a/net/dccp/minisocks.c
+++ b/net/dccp/minisocks.c
--- a/net/dccp/options.c
+++ b/net/dccp/options.c
--- a/net/dccp/timer.c
+++ b/net/dccp/timer.c
--- a/net/ipv4/arp.c
+++ b/net/ipv4/arp.c
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
--- a/net/ipv4/inet_connection_sock.c
+++ b/net/ipv4/inet_connection_sock.c
--- a/net/ipv4/inet_hashtables.c
+++ b/net/ipv4/inet_hashtables.c
--- a/net/ipv4/inet_timewait_sock.c
+++ b/net/ipv4/inet_timewait_sock.c
--- a/net/ipv4/ip_forward.c
+++ b/net/ipv4/ip_forward.c
--- a/net/ipv4/ip_fragment.c
+++ b/net/ipv4/ip_fragment.c
--- a/net/ipv4/ip_input.c
+++ b/net/ipv4/ip_input.c
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
--- a/net/ipv4/syncookies.c
+++ b/net/ipv4/syncookies.c
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
--- a/net/ipv4/tcp_cdg.c
+++ b/net/ipv4/tcp_cdg.c
--- a/net/ipv4/tcp_cubic.c
+++ b/net/ipv4/tcp_cubic.c
--- a/net/ipv4/tcp_fastopen.c
+++ b/net/ipv4/tcp_fastopen.c
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
--- a/net/ipv4/tcp_minisocks.c
+++ b/net/ipv4/tcp_minisocks.c
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
--- a/net/ipv4/tcp_recovery.c
+++ b/net/ipv4/tcp_recovery.c
--- a/net/ipv4/tcp_timer.c
+++ b/net/ipv4/tcp_timer.c
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
--- a/net/ipv6/exthdrs.c
+++ b/net/ipv6/exthdrs.c
--- a/net/ipv6/icmp.c
+++ b/net/ipv6/icmp.c
--- a/net/ipv6/inet6_hashtables.c
+++ b/net/ipv6/inet6_hashtables.c
--- a/net/ipv6/ip6_input.c
+++ b/net/ipv6/ip6_input.c
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
--- a/net/ipv6/ip6mr.c
+++ b/net/ipv6/ip6mr.c
--- a/net/ipv6/reassembly.c
+++ b/net/ipv6/reassembly.c
--- a/net/ipv6/syncookies.c
+++ b/net/ipv6/syncookies.c
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
--- a/net/rxrpc/ar-input.c
+++ b/net/rxrpc/ar-input.c
--- a/net/sctp/chunk.c
+++ b/net/sctp/chunk.c
--- a/net/sctp/input.c
+++ b/net/sctp/input.c
--- a/net/sctp/ipv6.c
+++ b/net/sctp/ipv6.c
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c