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

net: rename ICMP6_INC_STATS_BH() 



Rename ICMP6_INC_STATS_BH() to __ICMP6_INC_STATS()

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

include/net/ipv6.h

+1 −1
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ extern int sysctl_mld_qrv; 
		_DEVUPD(net, ipv6, 64_BH, idev, field, val)

#define ICMP6_INC_STATS(net, idev, field)	\

		_DEVINCATOMIC(net, icmpv6, , idev, field)

#define ICMP6_INC_STATS_BH(net, idev, field)	\

#define __ICMP6_INC_STATS(net, idev, field)	\

		_DEVINCATOMIC(net, icmpv6, _BH, idev, field)



#define ICMP6MSGOUT_INC_STATS(net, idev, field)		\

net/dccp/ipv6.c

+4 −4
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ static void dccp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, 


	if (skb->len < offset + sizeof(*dh) ||

	    skb->len < offset + __dccp_basic_hdr_len(dh)) {

		ICMP6_INC_STATS_BH(net, __in6_dev_get(skb->dev),

		__ICMP6_INC_STATS(net, __in6_dev_get(skb->dev),

				  ICMP6_MIB_INERRORS);

		return;

	}
@@ -91,7 +91,7 @@ static void dccp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, 
					inet6_iif(skb));



	if (!sk) {

		ICMP6_INC_STATS_BH(net, __in6_dev_get(skb->dev),

		__ICMP6_INC_STATS(net, __in6_dev_get(skb->dev),

				  ICMP6_MIB_INERRORS);

		return;

	}

net/ipv6/icmp.c

+5 −5
Original line number Diff line number Diff line
@@ -622,7 +622,7 @@ static void icmpv6_echo_reply(struct sk_buff *skb) 
				np->dontfrag, &sockc_unused);



	if (err) {

		ICMP6_INC_STATS_BH(net, idev, ICMP6_MIB_OUTERRORS);

		__ICMP6_INC_STATS(net, idev, ICMP6_MIB_OUTERRORS);

		ip6_flush_pending_frames(sk);

	} else {

		err = icmpv6_push_pending_frames(sk, &fl6, &tmp_hdr,
@@ -674,7 +674,7 @@ void icmpv6_notify(struct sk_buff *skb, u8 type, u8 code, __be32 info) 
	return;



out:

	ICMP6_INC_STATS_BH(net, __in6_dev_get(skb->dev), ICMP6_MIB_INERRORS);

	__ICMP6_INC_STATS(net, __in6_dev_get(skb->dev), ICMP6_MIB_INERRORS);

}



/*
@@ -710,7 +710,7 @@ static int icmpv6_rcv(struct sk_buff *skb) 
		skb_set_network_header(skb, nh);

	}



	ICMP6_INC_STATS_BH(dev_net(dev), idev, ICMP6_MIB_INMSGS);

	__ICMP6_INC_STATS(dev_net(dev), idev, ICMP6_MIB_INMSGS);



	saddr = &ipv6_hdr(skb)->saddr;

	daddr = &ipv6_hdr(skb)->daddr;
@@ -812,9 +812,9 @@ static int icmpv6_rcv(struct sk_buff *skb) 
	return 0;



csum_error:

	ICMP6_INC_STATS_BH(dev_net(dev), idev, ICMP6_MIB_CSUMERRORS);

	__ICMP6_INC_STATS(dev_net(dev), idev, ICMP6_MIB_CSUMERRORS);

discard_it:

	ICMP6_INC_STATS_BH(dev_net(dev), idev, ICMP6_MIB_INERRORS);

	__ICMP6_INC_STATS(dev_net(dev), idev, ICMP6_MIB_INERRORS);

drop_no_count:

	kfree_skb(skb);

	return 0;

net/ipv6/tcp_ipv6.c

+2 −2
Original line number Diff line number Diff line
@@ -336,7 +336,7 @@ static void tcp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, 
					skb->dev->ifindex);



	if (!sk) {

		ICMP6_INC_STATS_BH(net, __in6_dev_get(skb->dev),

		__ICMP6_INC_STATS(net, __in6_dev_get(skb->dev),

				  ICMP6_MIB_INERRORS);

		return;

	}

net/ipv6/udp.c

+2 −2
Original line number Diff line number Diff line
@@ -521,7 +521,7 @@ void __udp6_lib_err(struct sk_buff *skb, struct inet6_skb_parm *opt, 
	sk = __udp6_lib_lookup(net, daddr, uh->dest, saddr, uh->source,

			       inet6_iif(skb), udptable, skb);

	if (!sk) {

		ICMP6_INC_STATS_BH(net, __in6_dev_get(skb->dev),

		__ICMP6_INC_STATS(net, __in6_dev_get(skb->dev),

				  ICMP6_MIB_INERRORS);

		return;

	}