Patchwork [net-next,11/14] ipv6: added net argument to ICMP6MSGIN_INC_STATS_BH

login
register
mail settings
Submitter Denis V. Lunev
Date Oct. 8, 2008, 11:51 a.m.
Message ID <1223466722-8169-11-git-send-email-den@openvz.org>
Download mbox | patch
Permalink /patch/3301/
State Accepted
Delegated to: David Miller
Headers show

Comments

Denis V. Lunev - Oct. 8, 2008, 11:51 a.m.
Signed-off-by: Denis V. Lunev <den@openvz.org>
---
 include/net/ipv6.h |    4 ++--
 net/ipv6/icmp.c    |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
David Miller - Oct. 8, 2008, 6:16 p.m.
From: "Denis V. Lunev" <den@openvz.org>
Date: Wed,  8 Oct 2008 15:51:59 +0400

> Signed-off-by: Denis V. Lunev <den@openvz.org>

Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index 01da23c..47a76bf 100644
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
@@ -148,8 +148,8 @@  DECLARE_SNMP_STAT(struct icmpv6msg_mib, icmpv6msg_statistics);
 	_DEVINC(icmpv6msg, , idev, field +256); })
 #define ICMP6MSGOUT_INC_STATS_BH(net, idev, field) ({ (void)(net); \
 	_DEVINC(icmpv6msg, _BH, idev, field +256); })
-#define ICMP6MSGIN_INC_STATS_BH(idev, field) \
-	_DEVINC(icmpv6msg, _BH, idev, field)
+#define ICMP6MSGIN_INC_STATS_BH(net, idev, field) ({ (void)(net); \
+	_DEVINC(icmpv6msg, _BH, idev, field); })
 
 struct ip6_ra_chain
 {
diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
index 4c96155..9b7d19a 100644
--- a/net/ipv6/icmp.c
+++ b/net/ipv6/icmp.c
@@ -693,7 +693,7 @@  static int icmpv6_rcv(struct sk_buff *skb)
 
 	type = hdr->icmp6_type;
 
-	ICMP6MSGIN_INC_STATS_BH(idev, type);
+	ICMP6MSGIN_INC_STATS_BH(dev_net(dev), idev, type);
 
 	switch (type) {
 	case ICMPV6_ECHO_REQUEST: