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

Commit 5a57d4c7 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_BH 



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

include/net/ipv6.h

+2 −2
Original line number Diff line number Diff line
@@ -146,8 +146,8 @@ DECLARE_SNMP_STAT(struct icmpv6msg_mib, icmpv6msg_statistics); 


#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 ICMP6MSGOUT_INC_STATS_BH(net, idev, field) ({ (void)(net); \

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

#define ICMP6MSGIN_INC_STATS(idev, field) \

	 _DEVINC(icmpv6msg, , idev, field)

#define ICMP6MSGIN_INC_STATS_BH(idev, field) \

net/ipv6/ip6_output.c

+1 −1
Original line number Diff line number Diff line
@@ -1482,7 +1482,7 @@ int ip6_push_pending_frames(struct sock *sk) 
	if (proto == IPPROTO_ICMPV6) {

		struct inet6_dev *idev = ip6_dst_idev(skb->dst);



		ICMP6MSGOUT_INC_STATS_BH(idev, icmp6_hdr(skb)->icmp6_type);

		ICMP6MSGOUT_INC_STATS_BH(net, idev, icmp6_hdr(skb)->icmp6_type);

		ICMP6_INC_STATS_BH(net, idev, ICMP6_MIB_OUTMSGS);

	}

net/ipv6/mcast.c

+1 −1
Original line number Diff line number Diff line
@@ -1474,7 +1474,7 @@ static void mld_sendpack(struct sk_buff *skb) 
		      dst_output);

out:

	if (!err) {

		ICMP6MSGOUT_INC_STATS_BH(idev, ICMPV6_MLD2_REPORT);

		ICMP6MSGOUT_INC_STATS_BH(net, idev, ICMPV6_MLD2_REPORT);

		ICMP6_INC_STATS_BH(net, idev, ICMP6_MIB_OUTMSGS);

		IP6_INC_STATS_BH(net, idev, IPSTATS_MIB_OUTMCASTPKTS);

	} else