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

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

ipv6: added net argument to ICMP6MSGOUT_INC_STATS 



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

include/net/ipv6.h

+2 −2
Original line number Diff line number Diff line
@@ -144,8 +144,8 @@ DECLARE_SNMP_STAT(struct icmpv6msg_mib, icmpv6msg_statistics); 
#define ICMP6_INC_STATS_BH(net, idev, field)	({ (void)(net); \

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



#define ICMP6MSGOUT_INC_STATS(idev, field) \

	_DEVINC(icmpv6msg, , idev, field +256)

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

	_DEVINC(icmpv6msg, , idev, field +256); })

#define ICMP6MSGOUT_INC_STATS_BH(idev, field) \

	_DEVINC(icmpv6msg, _BH, idev, field +256)

#define ICMP6MSGIN_INC_STATS(idev, field) \

net/ipv6/mcast.c

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

out:

	if (!err) {

		ICMP6MSGOUT_INC_STATS(idev, type);

		ICMP6MSGOUT_INC_STATS(net, idev, type);

		ICMP6_INC_STATS(net, idev, ICMP6_MIB_OUTMSGS);

		IP6_INC_STATS(net, idev, IPSTATS_MIB_OUTMCASTPKTS);

	} else

net/ipv6/ndisc.c

+2 −2
Original line number Diff line number Diff line
@@ -521,7 +521,7 @@ static void __ndisc_send(struct net_device *dev, 
	err = NF_HOOK(PF_INET6, NF_INET_LOCAL_OUT, skb, NULL, dst->dev,

		      dst_output);

	if (!err) {

		ICMP6MSGOUT_INC_STATS(idev, type);

		ICMP6MSGOUT_INC_STATS(net, idev, type);

		ICMP6_INC_STATS(net, idev, ICMP6_MIB_OUTMSGS);

	}
@@ -1585,7 +1585,7 @@ void ndisc_send_redirect(struct sk_buff *skb, struct neighbour *neigh, 
	err = NF_HOOK(PF_INET6, NF_INET_LOCAL_OUT, buff, NULL, dst->dev,

		      dst_output);

	if (!err) {

		ICMP6MSGOUT_INC_STATS(idev, NDISC_REDIRECT);

		ICMP6MSGOUT_INC_STATS(net, idev, NDISC_REDIRECT);

		ICMP6_INC_STATS(net, idev, ICMP6_MIB_OUTMSGS);

	}