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

Commit 98f61995 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

net: rename IP_ADD_STATS_BH() 



Rename IP_ADD_STATS_BH() to __IP_ADD_STATS()

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a16292a0

include/net/ip.h

+1 −1
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ void ip_send_unicast_reply(struct sock *sk, struct sk_buff *skb, 
#define IP_INC_STATS(net, field)	SNMP_INC_STATS64((net)->mib.ip_statistics, field)

#define __IP_INC_STATS(net, field)	SNMP_INC_STATS64_BH((net)->mib.ip_statistics, field)

#define IP_ADD_STATS(net, field, val)	SNMP_ADD_STATS64((net)->mib.ip_statistics, field, val)

#define IP_ADD_STATS_BH(net, field, val) SNMP_ADD_STATS64_BH((net)->mib.ip_statistics, field, val)

#define __IP_ADD_STATS(net, field, val) SNMP_ADD_STATS64_BH((net)->mib.ip_statistics, field, val)

#define IP_UPD_PO_STATS(net, field, val) SNMP_UPD_PO_STATS64((net)->mib.ip_statistics, field, val)

#define IP_UPD_PO_STATS_BH(net, field, val) SNMP_UPD_PO_STATS64_BH((net)->mib.ip_statistics, field, val)

#define NET_INC_STATS(net, field)	SNMP_INC_STATS((net)->mib.net_statistics, field)

net/ipv4/ip_forward.c

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ static int ip_forward_finish(struct net *net, struct sock *sk, struct sk_buff *s 
	struct ip_options *opt	= &(IPCB(skb)->opt);



	__IP_INC_STATS(net, IPSTATS_MIB_OUTFORWDATAGRAMS);

	IP_ADD_STATS_BH(net, IPSTATS_MIB_OUTOCTETS, skb->len);

	__IP_ADD_STATS(net, IPSTATS_MIB_OUTOCTETS, skb->len);



	if (unlikely(opt->optlen))

		ip_forward_options(skb);

net/ipv4/ip_input.c

+3 −3
Original line number Diff line number Diff line
@@ -439,7 +439,7 @@ int ip_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt, 
	BUILD_BUG_ON(IPSTATS_MIB_ECT1PKTS != IPSTATS_MIB_NOECTPKTS + INET_ECN_ECT_1);

	BUILD_BUG_ON(IPSTATS_MIB_ECT0PKTS != IPSTATS_MIB_NOECTPKTS + INET_ECN_ECT_0);

	BUILD_BUG_ON(IPSTATS_MIB_CEPKTS != IPSTATS_MIB_NOECTPKTS + INET_ECN_CE);

	IP_ADD_STATS_BH(net,

	__IP_ADD_STATS(net,

		       IPSTATS_MIB_NOECTPKTS + (iph->tos & INET_ECN_MASK),

		       max_t(unsigned short, 1, skb_shinfo(skb)->gso_segs));