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

net: rename IP_UPD_PO_STATS_BH() 



Rename IP_UPD_PO_STATS_BH() to __IP_UPD_PO_STATS()

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

include/net/ip.h

+1 −1
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ void ip_send_unicast_reply(struct sock *sk, struct sk_buff *skb, 
#define IP_ADD_STATS(net, field, val)	SNMP_ADD_STATS64((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 __IP_UPD_PO_STATS(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)

#define NET_INC_STATS_BH(net, field)	SNMP_INC_STATS_BH((net)->mib.net_statistics, field)

#define NET_ADD_STATS(net, field, adnd)	SNMP_ADD_STATS((net)->mib.net_statistics, field, adnd)

net/ipv4/ip_input.c

+3 −3
Original line number Diff line number Diff line
@@ -358,9 +358,9 @@ static int ip_rcv_finish(struct net *net, struct sock *sk, struct sk_buff *skb) 


	rt = skb_rtable(skb);

	if (rt->rt_type == RTN_MULTICAST) {

		IP_UPD_PO_STATS_BH(net, IPSTATS_MIB_INMCAST, skb->len);

		__IP_UPD_PO_STATS(net, IPSTATS_MIB_INMCAST, skb->len);

	} else if (rt->rt_type == RTN_BROADCAST) {

		IP_UPD_PO_STATS_BH(net, IPSTATS_MIB_INBCAST, skb->len);

		__IP_UPD_PO_STATS(net, IPSTATS_MIB_INBCAST, skb->len);

	} else if (skb->pkt_type == PACKET_BROADCAST ||

		   skb->pkt_type == PACKET_MULTICAST) {

		struct in_device *in_dev = __in_dev_get_rcu(skb->dev);
@@ -409,7 +409,7 @@ int ip_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt, 




	net = dev_net(dev);

	IP_UPD_PO_STATS_BH(net, IPSTATS_MIB_IN, skb->len);

	__IP_UPD_PO_STATS(net, IPSTATS_MIB_IN, skb->len);



	skb = skb_share_check(skb, GFP_ATOMIC);

	if (!skb) {