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

Commit 7c73a6fa authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller
Browse files

mib: add net to IP_INC_STATS_BH 



Signed-off-by: default avatarPavel Emelyanov <xemul@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5e38e270

include/net/ip.h

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ struct ipv4_config 
extern struct ipv4_config ipv4_config;

DECLARE_SNMP_STAT(struct ipstats_mib, ip_statistics);

#define IP_INC_STATS(net, field)	do { (void)net; SNMP_INC_STATS(ip_statistics, field); } while (0)

#define IP_INC_STATS_BH(field)		SNMP_INC_STATS_BH(ip_statistics, field)

#define IP_INC_STATS_BH(net, field)	do { (void)net; SNMP_INC_STATS_BH(ip_statistics, field); } while (0)

#define IP_ADD_STATS_BH(field, val)	SNMP_ADD_STATS_BH(ip_statistics, field, val)

DECLARE_SNMP_STAT(struct linux_mib, net_statistics);

#define NET_INC_STATS(field)		SNMP_INC_STATS(net_statistics, field)

net/dccp/ipv4.c

+1 −1
Original line number Diff line number Diff line
@@ -465,7 +465,7 @@ static struct dst_entry* dccp_v4_route_skb(struct net *net, struct sock *sk, 


	security_skb_classify_flow(skb, &fl);

	if (ip_route_output_flow(net, &rt, &fl, sk, 0)) {

		IP_INC_STATS_BH(IPSTATS_MIB_OUTNOROUTES);

		IP_INC_STATS_BH(net, IPSTATS_MIB_OUTNOROUTES);

		return NULL;

	}

net/ipv4/datagram.c

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ int ip4_datagram_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) 
			       inet->sport, usin->sin_port, sk, 1);

	if (err) {

		if (err == -ENETUNREACH)

			IP_INC_STATS_BH(IPSTATS_MIB_OUTNOROUTES);

			IP_INC_STATS_BH(sock_net(sk), IPSTATS_MIB_OUTNOROUTES);

		return err;

	}

net/ipv4/inet_connection_sock.c

+2 −2
Original line number Diff line number Diff line
@@ -342,12 +342,12 @@ struct dst_entry* inet_csk_route_req(struct sock *sk, 


	security_req_classify_flow(req, &fl);

	if (ip_route_output_flow(net, &rt, &fl, sk, 0)) {

		IP_INC_STATS_BH(IPSTATS_MIB_OUTNOROUTES);

		IP_INC_STATS_BH(net, IPSTATS_MIB_OUTNOROUTES);

		return NULL;

	}

	if (opt && opt->is_strictroute && rt->rt_dst != rt->rt_gateway) {

		ip_rt_put(rt);

		IP_INC_STATS_BH(IPSTATS_MIB_OUTNOROUTES);

		IP_INC_STATS_BH(net, IPSTATS_MIB_OUTNOROUTES);

		return NULL;

	}

	return &rt->u.dst;

net/ipv4/ip_forward.c

+2 −2
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ static int ip_forward_finish(struct sk_buff *skb) 
{

	struct ip_options * opt	= &(IPCB(skb)->opt);



	IP_INC_STATS_BH(IPSTATS_MIB_OUTFORWDATAGRAMS);

	IP_INC_STATS_BH(dev_net(skb->dst->dev), IPSTATS_MIB_OUTFORWDATAGRAMS);



	if (unlikely(opt->optlen))

		ip_forward_options(skb);
@@ -123,7 +123,7 @@ sr_failed: 


too_many_hops:

	/* Tell the sender its packet died... */

	IP_INC_STATS_BH(IPSTATS_MIB_INHDRERRORS);

	IP_INC_STATS_BH(dev_net(skb->dst->dev), IPSTATS_MIB_INHDRERRORS);

	icmp_send(skb, ICMP_TIME_EXCEEDED, ICMP_EXC_TTL, 0);

drop:

	kfree_skb(skb);