From 7ffb9ab926829dac991d48e221aa66e9570e7fca Mon Sep 17 00:00:00 2001
From: "Denis V. Lunev" <den@openvz.org>
Date: Wed, 8 Oct 2008 10:34:54 -0700
Subject: [PATCH] --- yaml --- r: 112151 b: refs/heads/master c:
 55d43808eb26e689dacb95b11f956a3b1a56a5f3 h: refs/heads/master i:   112149:
 bcb1c8cee6dcdb2f0ac52ba14678ddc68e6eff29   112147:
 c6acda998959a54a169212348a0d1040961da5d6   112143:
 d0922a5d6601dab8d2e0d8380c94b1dfd61ff266 v: v3

---
 [refs]                   | 2 +-
 trunk/include/net/ipv6.h | 4 ++--
 trunk/net/ipv6/icmp.c    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 3fba896e671e..17c75acc6b50 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a712d3e859b78edc44d5664d867626d3022bd18e
+refs/heads/master: 55d43808eb26e689dacb95b11f956a3b1a56a5f3
diff --git a/trunk/include/net/ipv6.h b/trunk/include/net/ipv6.h
index 01da23c061e3..47a76bfbf763 100644
--- a/trunk/include/net/ipv6.h
+++ b/trunk/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/trunk/net/ipv6/icmp.c b/trunk/net/ipv6/icmp.c
index 4c961556306a..9b7d19ae5ced 100644
--- a/trunk/net/ipv6/icmp.c
+++ b/trunk/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: