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

ipv6: rename IP6_INC_STATS_BH() 



Rename IP6_INC_STATS_BH() to __IP6_INC_STATS()
and IP6_ADD_STATS_BH() to __IP6_ADD_STATS()

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

include/net/ipv6.h

+2 −2
Original line number Diff line number Diff line
@@ -167,11 +167,11 @@ extern int sysctl_mld_qrv; 


#define IP6_INC_STATS(net, idev,field)		\

		_DEVINC(net, ipv6, 64, idev, field)

#define IP6_INC_STATS_BH(net, idev,field)	\

#define __IP6_INC_STATS(net, idev,field)	\

		_DEVINC(net, ipv6, 64_BH, idev, field)

#define IP6_ADD_STATS(net, idev,field,val)	\

		_DEVADD(net, ipv6, 64, idev, field, val)

#define IP6_ADD_STATS_BH(net, idev,field,val)	\

#define __IP6_ADD_STATS(net, idev,field,val)	\

		_DEVADD(net, ipv6, 64_BH, idev, field, val)

#define IP6_UPD_PO_STATS(net, idev,field,val)   \

		_DEVUPD(net, ipv6, 64, idev, field, val)

net/bridge/br_netfilter_ipv6.c

+5 −5
Original line number Diff line number Diff line
@@ -122,12 +122,12 @@ int br_validate_ipv6(struct net *net, struct sk_buff *skb) 


	if (pkt_len || hdr->nexthdr != NEXTHDR_HOP) {

		if (pkt_len + ip6h_len > skb->len) {

			IP6_INC_STATS_BH(net, idev,

			__IP6_INC_STATS(net, idev,

					IPSTATS_MIB_INTRUNCATEDPKTS);

			goto drop;

		}

		if (pskb_trim_rcsum(skb, pkt_len + ip6h_len)) {

			IP6_INC_STATS_BH(net, idev,

			__IP6_INC_STATS(net, idev,

					IPSTATS_MIB_INDISCARDS);

			goto drop;

		}
@@ -142,7 +142,7 @@ int br_validate_ipv6(struct net *net, struct sk_buff *skb) 
	return 0;



inhdr_error:

	IP6_INC_STATS_BH(net, idev, IPSTATS_MIB_INHDRERRORS);

	__IP6_INC_STATS(net, idev, IPSTATS_MIB_INHDRERRORS);

drop:

	return -1;

}

net/ipv6/exthdrs.c

+33 −33
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ static int ipv6_destopt_rcv(struct sk_buff *skb) 
	if (!pskb_may_pull(skb, skb_transport_offset(skb) + 8) ||

	    !pskb_may_pull(skb, (skb_transport_offset(skb) +

				 ((skb_transport_header(skb)[1] + 1) << 3)))) {

		IP6_INC_STATS_BH(dev_net(dst->dev), ip6_dst_idev(dst),

		__IP6_INC_STATS(dev_net(dst->dev), ip6_dst_idev(dst),

				IPSTATS_MIB_INHDRERRORS);

		kfree_skb(skb);

		return -1;
@@ -280,7 +280,7 @@ static int ipv6_destopt_rcv(struct sk_buff *skb) 
		return 1;

	}



	IP6_INC_STATS_BH(dev_net(dst->dev),

	__IP6_INC_STATS(dev_net(dst->dev),

			ip6_dst_idev(dst), IPSTATS_MIB_INHDRERRORS);

	return -1;

}
@@ -309,7 +309,7 @@ static int ipv6_rthdr_rcv(struct sk_buff *skb) 
	if (!pskb_may_pull(skb, skb_transport_offset(skb) + 8) ||

	    !pskb_may_pull(skb, (skb_transport_offset(skb) +

				 ((skb_transport_header(skb)[1] + 1) << 3)))) {

		IP6_INC_STATS_BH(net, ip6_dst_idev(skb_dst(skb)),

		__IP6_INC_STATS(net, ip6_dst_idev(skb_dst(skb)),

				IPSTATS_MIB_INHDRERRORS);

		kfree_skb(skb);

		return -1;
@@ -319,7 +319,7 @@ static int ipv6_rthdr_rcv(struct sk_buff *skb) 


	if (ipv6_addr_is_multicast(&ipv6_hdr(skb)->daddr) ||

	    skb->pkt_type != PACKET_HOST) {

		IP6_INC_STATS_BH(net, ip6_dst_idev(skb_dst(skb)),

		__IP6_INC_STATS(net, ip6_dst_idev(skb_dst(skb)),

				IPSTATS_MIB_INADDRERRORS);

		kfree_skb(skb);

		return -1;
@@ -334,7 +334,7 @@ static int ipv6_rthdr_rcv(struct sk_buff *skb) 
			 * processed by own

			 */

			if (!addr) {

				IP6_INC_STATS_BH(net, ip6_dst_idev(skb_dst(skb)),

				__IP6_INC_STATS(net, ip6_dst_idev(skb_dst(skb)),

						IPSTATS_MIB_INADDRERRORS);

				kfree_skb(skb);

				return -1;
@@ -360,7 +360,7 @@ static int ipv6_rthdr_rcv(struct sk_buff *skb) 
			goto unknown_rh;

		/* Silently discard invalid RTH type 2 */

		if (hdr->hdrlen != 2 || hdr->segments_left != 1) {

			IP6_INC_STATS_BH(net, ip6_dst_idev(skb_dst(skb)),

			__IP6_INC_STATS(net, ip6_dst_idev(skb_dst(skb)),

					IPSTATS_MIB_INHDRERRORS);

			kfree_skb(skb);

			return -1;
@@ -379,7 +379,7 @@ static int ipv6_rthdr_rcv(struct sk_buff *skb) 
	n = hdr->hdrlen >> 1;



	if (hdr->segments_left > n) {

		IP6_INC_STATS_BH(net, ip6_dst_idev(skb_dst(skb)),

		__IP6_INC_STATS(net, ip6_dst_idev(skb_dst(skb)),

				IPSTATS_MIB_INHDRERRORS);

		icmpv6_param_prob(skb, ICMPV6_HDR_FIELD,

				  ((&hdr->segments_left) -
@@ -393,7 +393,7 @@ static int ipv6_rthdr_rcv(struct sk_buff *skb) 
	if (skb_cloned(skb)) {

		/* the copy is a forwarded packet */

		if (pskb_expand_head(skb, 0, 0, GFP_ATOMIC)) {

			IP6_INC_STATS_BH(net, ip6_dst_idev(skb_dst(skb)),

			__IP6_INC_STATS(net, ip6_dst_idev(skb_dst(skb)),

					IPSTATS_MIB_OUTDISCARDS);

			kfree_skb(skb);

			return -1;
@@ -416,13 +416,13 @@ static int ipv6_rthdr_rcv(struct sk_buff *skb) 
		if (xfrm6_input_addr(skb, (xfrm_address_t *)addr,

				     (xfrm_address_t *)&ipv6_hdr(skb)->saddr,

				     IPPROTO_ROUTING) < 0) {

			IP6_INC_STATS_BH(net, ip6_dst_idev(skb_dst(skb)),

			__IP6_INC_STATS(net, ip6_dst_idev(skb_dst(skb)),

					IPSTATS_MIB_INADDRERRORS);

			kfree_skb(skb);

			return -1;

		}

		if (!ipv6_chk_home_addr(dev_net(skb_dst(skb)->dev), addr)) {

			IP6_INC_STATS_BH(net, ip6_dst_idev(skb_dst(skb)),

			__IP6_INC_STATS(net, ip6_dst_idev(skb_dst(skb)),

					IPSTATS_MIB_INADDRERRORS);

			kfree_skb(skb);

			return -1;
@@ -434,7 +434,7 @@ static int ipv6_rthdr_rcv(struct sk_buff *skb) 
	}



	if (ipv6_addr_is_multicast(addr)) {

		IP6_INC_STATS_BH(net, ip6_dst_idev(skb_dst(skb)),

		__IP6_INC_STATS(net, ip6_dst_idev(skb_dst(skb)),

				IPSTATS_MIB_INADDRERRORS);

		kfree_skb(skb);

		return -1;
@@ -454,7 +454,7 @@ static int ipv6_rthdr_rcv(struct sk_buff *skb) 


	if (skb_dst(skb)->dev->flags&IFF_LOOPBACK) {

		if (ipv6_hdr(skb)->hop_limit <= 1) {

			IP6_INC_STATS_BH(net, ip6_dst_idev(skb_dst(skb)),

			__IP6_INC_STATS(net, ip6_dst_idev(skb_dst(skb)),

					IPSTATS_MIB_INHDRERRORS);

			icmpv6_send(skb, ICMPV6_TIME_EXCEED, ICMPV6_EXC_HOPLIMIT,

				    0);
@@ -470,7 +470,7 @@ static int ipv6_rthdr_rcv(struct sk_buff *skb) 
	return -1;



unknown_rh:

	IP6_INC_STATS_BH(net, ip6_dst_idev(skb_dst(skb)), IPSTATS_MIB_INHDRERRORS);

	__IP6_INC_STATS(net, ip6_dst_idev(skb_dst(skb)), IPSTATS_MIB_INHDRERRORS);

	icmpv6_param_prob(skb, ICMPV6_HDR_FIELD,

			  (&hdr->type) - skb_network_header(skb));

	return -1;
@@ -568,27 +568,27 @@ static bool ipv6_hop_jumbo(struct sk_buff *skb, int optoff) 
	if (nh[optoff + 1] != 4 || (optoff & 3) != 2) {

		net_dbg_ratelimited("ipv6_hop_jumbo: wrong jumbo opt length/alignment %d\n",

				    nh[optoff+1]);

		IP6_INC_STATS_BH(net, ipv6_skb_idev(skb),

		__IP6_INC_STATS(net, ipv6_skb_idev(skb),

				IPSTATS_MIB_INHDRERRORS);

		goto drop;

	}



	pkt_len = ntohl(*(__be32 *)(nh + optoff + 2));

	if (pkt_len <= IPV6_MAXPLEN) {

		IP6_INC_STATS_BH(net, ipv6_skb_idev(skb),

		__IP6_INC_STATS(net, ipv6_skb_idev(skb),

				IPSTATS_MIB_INHDRERRORS);

		icmpv6_param_prob(skb, ICMPV6_HDR_FIELD, optoff+2);

		return false;

	}

	if (ipv6_hdr(skb)->payload_len) {

		IP6_INC_STATS_BH(net, ipv6_skb_idev(skb),

		__IP6_INC_STATS(net, ipv6_skb_idev(skb),

				IPSTATS_MIB_INHDRERRORS);

		icmpv6_param_prob(skb, ICMPV6_HDR_FIELD, optoff);

		return false;

	}



	if (pkt_len > skb->len - sizeof(struct ipv6hdr)) {

		IP6_INC_STATS_BH(net, ipv6_skb_idev(skb),

		__IP6_INC_STATS(net, ipv6_skb_idev(skb),

				IPSTATS_MIB_INTRUNCATEDPKTS);

		goto drop;

	}

net/ipv6/ip6_input.c

+14 −14
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ int ipv6_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt 


	if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL ||

	    !idev || unlikely(idev->cnf.disable_ipv6)) {

		IP6_INC_STATS_BH(net, idev, IPSTATS_MIB_INDISCARDS);

		__IP6_INC_STATS(net, idev, IPSTATS_MIB_INDISCARDS);

		goto drop;

	}
@@ -109,7 +109,7 @@ int ipv6_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt 
	if (hdr->version != 6)

		goto err;



	IP6_ADD_STATS_BH(net, idev,

	__IP6_ADD_STATS(net, idev,

			IPSTATS_MIB_NOECTPKTS +

				(ipv6_get_dsfield(hdr) & INET_ECN_MASK),

			max_t(unsigned short, 1, skb_shinfo(skb)->gso_segs));
@@ -169,12 +169,12 @@ int ipv6_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt 
	/* pkt_len may be zero if Jumbo payload option is present */

	if (pkt_len || hdr->nexthdr != NEXTHDR_HOP) {

		if (pkt_len + sizeof(struct ipv6hdr) > skb->len) {

			IP6_INC_STATS_BH(net,

			__IP6_INC_STATS(net,

					idev, IPSTATS_MIB_INTRUNCATEDPKTS);

			goto drop;

		}

		if (pskb_trim_rcsum(skb, pkt_len + sizeof(struct ipv6hdr))) {

			IP6_INC_STATS_BH(net, idev, IPSTATS_MIB_INHDRERRORS);

			__IP6_INC_STATS(net, idev, IPSTATS_MIB_INHDRERRORS);

			goto drop;

		}

		hdr = ipv6_hdr(skb);
@@ -182,7 +182,7 @@ int ipv6_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt 


	if (hdr->nexthdr == NEXTHDR_HOP) {

		if (ipv6_parse_hopopts(skb) < 0) {

			IP6_INC_STATS_BH(net, idev, IPSTATS_MIB_INHDRERRORS);

			__IP6_INC_STATS(net, idev, IPSTATS_MIB_INHDRERRORS);

			rcu_read_unlock();

			return NET_RX_DROP;

		}
@@ -197,7 +197,7 @@ int ipv6_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt 
		       net, NULL, skb, dev, NULL,

		       ip6_rcv_finish);

err:

	IP6_INC_STATS_BH(net, idev, IPSTATS_MIB_INHDRERRORS);

	__IP6_INC_STATS(net, idev, IPSTATS_MIB_INHDRERRORS);

drop:

	rcu_read_unlock();

	kfree_skb(skb);
@@ -259,18 +259,18 @@ static int ip6_input_finish(struct net *net, struct sock *sk, struct sk_buff *sk 
		if (ret > 0)

			goto resubmit;

		else if (ret == 0)

			IP6_INC_STATS_BH(net, idev, IPSTATS_MIB_INDELIVERS);

			__IP6_INC_STATS(net, idev, IPSTATS_MIB_INDELIVERS);

	} else {

		if (!raw) {

			if (xfrm6_policy_check(NULL, XFRM_POLICY_IN, skb)) {

				IP6_INC_STATS_BH(net, idev,

				__IP6_INC_STATS(net, idev,

						IPSTATS_MIB_INUNKNOWNPROTOS);

				icmpv6_send(skb, ICMPV6_PARAMPROB,

					    ICMPV6_UNK_NEXTHDR, nhoff);

			}

			kfree_skb(skb);

		} else {

			IP6_INC_STATS_BH(net, idev, IPSTATS_MIB_INDELIVERS);

			__IP6_INC_STATS(net, idev, IPSTATS_MIB_INDELIVERS);

			consume_skb(skb);

		}

	}
@@ -278,7 +278,7 @@ static int ip6_input_finish(struct net *net, struct sock *sk, struct sk_buff *sk 
	return 0;



discard:

	IP6_INC_STATS_BH(net, idev, IPSTATS_MIB_INDISCARDS);

	__IP6_INC_STATS(net, idev, IPSTATS_MIB_INDISCARDS);

	rcu_read_unlock();

	kfree_skb(skb);

	return 0;

net/ipv6/ip6_output.c

+17 −17
Original line number Diff line number Diff line
@@ -395,7 +395,7 @@ int ip6_forward(struct sk_buff *skb) 
		goto drop;



	if (!xfrm6_policy_check(NULL, XFRM_POLICY_FWD, skb)) {

		IP6_INC_STATS_BH(net, ip6_dst_idev(dst),

		__IP6_INC_STATS(net, ip6_dst_idev(dst),

				IPSTATS_MIB_INDISCARDS);

		goto drop;

	}
@@ -427,7 +427,7 @@ int ip6_forward(struct sk_buff *skb) 
		/* Force OUTPUT device used as source address */

		skb->dev = dst->dev;

		icmpv6_send(skb, ICMPV6_TIME_EXCEED, ICMPV6_EXC_HOPLIMIT, 0);

		IP6_INC_STATS_BH(net, ip6_dst_idev(dst),

		__IP6_INC_STATS(net, ip6_dst_idev(dst),

				IPSTATS_MIB_INHDRERRORS);



		kfree_skb(skb);
@@ -441,14 +441,14 @@ int ip6_forward(struct sk_buff *skb) 
		if (proxied > 0)

			return ip6_input(skb);

		else if (proxied < 0) {

			IP6_INC_STATS_BH(net, ip6_dst_idev(dst),

			__IP6_INC_STATS(net, ip6_dst_idev(dst),

					IPSTATS_MIB_INDISCARDS);

			goto drop;

		}

	}



	if (!xfrm6_route_forward(skb)) {

		IP6_INC_STATS_BH(net, ip6_dst_idev(dst),

		__IP6_INC_STATS(net, ip6_dst_idev(dst),

				IPSTATS_MIB_INDISCARDS);

		goto drop;

	}
@@ -505,16 +505,16 @@ int ip6_forward(struct sk_buff *skb) 
		/* Again, force OUTPUT device used as source address */

		skb->dev = dst->dev;

		icmpv6_send(skb, ICMPV6_PKT_TOOBIG, 0, mtu);

		IP6_INC_STATS_BH(net, ip6_dst_idev(dst),

		__IP6_INC_STATS(net, ip6_dst_idev(dst),

				IPSTATS_MIB_INTOOBIGERRORS);

		IP6_INC_STATS_BH(net, ip6_dst_idev(dst),

		__IP6_INC_STATS(net, ip6_dst_idev(dst),

				IPSTATS_MIB_FRAGFAILS);

		kfree_skb(skb);

		return -EMSGSIZE;

	}



	if (skb_cow(skb, dst->dev->hard_header_len)) {

		IP6_INC_STATS_BH(net, ip6_dst_idev(dst),

		__IP6_INC_STATS(net, ip6_dst_idev(dst),

				IPSTATS_MIB_OUTDISCARDS);

		goto drop;

	}
@@ -525,14 +525,14 @@ int ip6_forward(struct sk_buff *skb) 


	hdr->hop_limit--;



	IP6_INC_STATS_BH(net, ip6_dst_idev(dst), IPSTATS_MIB_OUTFORWDATAGRAMS);

	IP6_ADD_STATS_BH(net, ip6_dst_idev(dst), IPSTATS_MIB_OUTOCTETS, skb->len);

	__IP6_INC_STATS(net, ip6_dst_idev(dst), IPSTATS_MIB_OUTFORWDATAGRAMS);

	__IP6_ADD_STATS(net, ip6_dst_idev(dst), IPSTATS_MIB_OUTOCTETS, skb->len);

	return NF_HOOK(NFPROTO_IPV6, NF_INET_FORWARD,

		       net, NULL, skb, skb->dev, dst->dev,

		       ip6_forward_finish);



error:

	IP6_INC_STATS_BH(net, ip6_dst_idev(dst), IPSTATS_MIB_INADDRERRORS);

	__IP6_INC_STATS(net, ip6_dst_idev(dst), IPSTATS_MIB_INADDRERRORS);

drop:

	kfree_skb(skb);

	return -EINVAL;