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

net: rename ICMP_INC_STATS_BH() 



Rename ICMP_INC_STATS_BH() to __ICMP_INC_STATS()

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

include/net/icmp.h

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ struct icmp_err { 


extern const struct icmp_err icmp_err_convert[];

#define ICMP_INC_STATS(net, field)	SNMP_INC_STATS((net)->mib.icmp_statistics, field)

#define ICMP_INC_STATS_BH(net, field)	SNMP_INC_STATS_BH((net)->mib.icmp_statistics, field)

#define __ICMP_INC_STATS(net, field)	SNMP_INC_STATS_BH((net)->mib.icmp_statistics, field)

#define ICMPMSGOUT_INC_STATS(net, field)	SNMP_INC_STATS_ATOMIC_LONG((net)->mib.icmpmsg_statistics, field+256)

#define ICMPMSGIN_INC_STATS_BH(net, field)	SNMP_INC_STATS_ATOMIC_LONG((net)->mib.icmpmsg_statistics, field)

net/dccp/ipv4.c

+2 −2
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ static void dccp_v4_err(struct sk_buff *skb, u32 info) 


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

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

		ICMP_INC_STATS_BH(net, ICMP_MIB_INERRORS);

		__ICMP_INC_STATS(net, ICMP_MIB_INERRORS);

		return;

	}
@@ -256,7 +256,7 @@ static void dccp_v4_err(struct sk_buff *skb, u32 info) 
				       iph->saddr, ntohs(dh->dccph_sport),

				       inet_iif(skb));

	if (!sk) {

		ICMP_INC_STATS_BH(net, ICMP_MIB_INERRORS);

		__ICMP_INC_STATS(net, ICMP_MIB_INERRORS);

		return;

	}

net/ipv4/icmp.c

+8 −8
Original line number Diff line number Diff line
@@ -363,7 +363,7 @@ static void icmp_push_reply(struct icmp_bxm *icmp_param, 
			   icmp_param->data_len+icmp_param->head_len,

			   icmp_param->head_len,

			   ipc, rt, MSG_DONTWAIT) < 0) {

		ICMP_INC_STATS_BH(sock_net(sk), ICMP_MIB_OUTERRORS);

		__ICMP_INC_STATS(sock_net(sk), ICMP_MIB_OUTERRORS);

		ip_flush_pending_frames(sk);

	} else if ((skb = skb_peek(&sk->sk_write_queue)) != NULL) {

		struct icmphdr *icmph = icmp_hdr(skb);
@@ -744,7 +744,7 @@ static void icmp_socket_deliver(struct sk_buff *skb, u32 info) 
	 * avoid additional coding at protocol handlers.

	 */

	if (!pskb_may_pull(skb, iph->ihl * 4 + 8)) {

		ICMP_INC_STATS_BH(dev_net(skb->dev), ICMP_MIB_INERRORS);

		__ICMP_INC_STATS(dev_net(skb->dev), ICMP_MIB_INERRORS);

		return;

	}
@@ -865,7 +865,7 @@ static bool icmp_unreach(struct sk_buff *skb) 
out:

	return true;

out_err:

	ICMP_INC_STATS_BH(net, ICMP_MIB_INERRORS);

	__ICMP_INC_STATS(net, ICMP_MIB_INERRORS);

	return false;

}
@@ -877,7 +877,7 @@ static bool icmp_unreach(struct sk_buff *skb) 
static bool icmp_redirect(struct sk_buff *skb)

{

	if (skb->len < sizeof(struct iphdr)) {

		ICMP_INC_STATS_BH(dev_net(skb->dev), ICMP_MIB_INERRORS);

		__ICMP_INC_STATS(dev_net(skb->dev), ICMP_MIB_INERRORS);

		return false;

	}
@@ -956,7 +956,7 @@ static bool icmp_timestamp(struct sk_buff *skb) 
	return true;



out_err:

	ICMP_INC_STATS_BH(dev_net(skb_dst(skb)->dev), ICMP_MIB_INERRORS);

	__ICMP_INC_STATS(dev_net(skb_dst(skb)->dev), ICMP_MIB_INERRORS);

	return false;

}
@@ -996,7 +996,7 @@ int icmp_rcv(struct sk_buff *skb) 
		skb_set_network_header(skb, nh);

	}



	ICMP_INC_STATS_BH(net, ICMP_MIB_INMSGS);

	__ICMP_INC_STATS(net, ICMP_MIB_INMSGS);



	if (skb_checksum_simple_validate(skb))

		goto csum_error;
@@ -1052,9 +1052,9 @@ int icmp_rcv(struct sk_buff *skb) 
	kfree_skb(skb);

	return 0;

csum_error:

	ICMP_INC_STATS_BH(net, ICMP_MIB_CSUMERRORS);

	__ICMP_INC_STATS(net, ICMP_MIB_CSUMERRORS);

error:

	ICMP_INC_STATS_BH(net, ICMP_MIB_INERRORS);

	__ICMP_INC_STATS(net, ICMP_MIB_INERRORS);

	goto drop;

}

net/ipv4/tcp_ipv4.c

+1 −1
Original line number Diff line number Diff line
@@ -372,7 +372,7 @@ void tcp_v4_err(struct sk_buff *icmp_skb, u32 info) 
				       th->dest, iph->saddr, ntohs(th->source),

				       inet_iif(icmp_skb));

	if (!sk) {

		ICMP_INC_STATS_BH(net, ICMP_MIB_INERRORS);

		__ICMP_INC_STATS(net, ICMP_MIB_INERRORS);

		return;

	}

	if (sk->sk_state == TCP_TIME_WAIT) {

net/ipv4/udp.c

+1 −1
Original line number Diff line number Diff line
@@ -688,7 +688,7 @@ void __udp4_lib_err(struct sk_buff *skb, u32 info, struct udp_table *udptable) 
			iph->saddr, uh->source, skb->dev->ifindex, udptable,

			NULL);

	if (!sk) {

		ICMP_INC_STATS_BH(net, ICMP_MIB_INERRORS);

		__ICMP_INC_STATS(net, ICMP_MIB_INERRORS);

		return;	/* No socket for error */

	}