---

yaml --- r: 112151 b: refs/heads/master c: 55d4380 h: refs/heads/master i: 112149: bcb1c8c 112147: c6acda9 112143: d0922a5 v: v3
git-mirror · Oct 8, 2008 · 7ffb9ab · 7ffb9ab
1 parent 4b48d71
commit 7ffb9ab
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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: