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

Commit a862f6a6 authored by Denis V. Lunev's avatar Denis V. Lunev Committed by David S. Miller
Browse files

ipv6: added net argument to ICMP6_INC_STATS 



Signed-off-by: default avatarDenis V. Lunev <den@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 821d5777

include/net/ipv6.h

+2 −1
Original line number Diff line number Diff line
@@ -139,7 +139,8 @@ DECLARE_SNMP_STAT(struct ipstats_mib, ipv6_statistics); 
DECLARE_SNMP_STAT(struct icmpv6_mib, icmpv6_statistics);

DECLARE_SNMP_STAT(struct icmpv6msg_mib, icmpv6msg_statistics);



#define ICMP6_INC_STATS(idev, field)	_DEVINC(icmpv6, , idev, field)

#define ICMP6_INC_STATS(net, idev, field)	({ (void)(net); \

		_DEVINC(icmpv6, , idev, field); })

#define ICMP6_INC_STATS_BH(idev, field)	_DEVINC(icmpv6, _BH, idev, field)



#define ICMP6MSGOUT_INC_STATS(idev, field) \

net/ipv6/mcast.c

+1 −1
Original line number Diff line number Diff line
@@ -1840,7 +1840,7 @@ static void igmp6_send(struct in6_addr *addr, struct net_device *dev, int type) 
out:

	if (!err) {

		ICMP6MSGOUT_INC_STATS(idev, type);

		ICMP6_INC_STATS(idev, ICMP6_MIB_OUTMSGS);

		ICMP6_INC_STATS(net, idev, ICMP6_MIB_OUTMSGS);

		IP6_INC_STATS(net, idev, IPSTATS_MIB_OUTMCASTPKTS);

	} else

		IP6_INC_STATS(net, idev, IPSTATS_MIB_OUTDISCARDS);

net/ipv6/ndisc.c

+2 −2
Original line number Diff line number Diff line
@@ -522,7 +522,7 @@ static void __ndisc_send(struct net_device *dev, 
		      dst_output);

	if (!err) {

		ICMP6MSGOUT_INC_STATS(idev, type);

		ICMP6_INC_STATS(idev, ICMP6_MIB_OUTMSGS);

		ICMP6_INC_STATS(net, idev, ICMP6_MIB_OUTMSGS);

	}



	if (likely(idev != NULL))
@@ -1586,7 +1586,7 @@ void ndisc_send_redirect(struct sk_buff *skb, struct neighbour *neigh, 
		      dst_output);

	if (!err) {

		ICMP6MSGOUT_INC_STATS(idev, NDISC_REDIRECT);

		ICMP6_INC_STATS(idev, ICMP6_MIB_OUTMSGS);

		ICMP6_INC_STATS(net, idev, ICMP6_MIB_OUTMSGS);

	}



	if (likely(idev != NULL))