summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis V. Lunev <den@openvz.org>2008-10-08 10:32:43 -0700
committerDavid S. Miller <davem@davemloft.net>2008-10-08 11:13:31 -0700
commit821d57776d4dda47ef5f0c33fdb3c761214b2f9f (patch)
tree62d32df18aec4fa6915d0c72b60b1cec86771f56
parent483a47d2fe794328d29950fe00ce26dd405d9437 (diff)
downloadlinux-821d57776d4dda47ef5f0c33fdb3c761214b2f9f.tar.gz
linux-821d57776d4dda47ef5f0c33fdb3c761214b2f9f.tar.bz2
linux-821d57776d4dda47ef5f0c33fdb3c761214b2f9f.zip
ipv6: added net argument to IP6_ADD_STATS_BH
Signed-off-by: Denis V. Lunev <den@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/net/ipv6.h3
-rw-r--r--net/ipv6/reassembly.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index e7732d3a3f92..ac0487bab8b1 100644
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
@@ -133,7 +133,8 @@ DECLARE_SNMP_STAT(struct ipstats_mib, ipv6_statistics);
_DEVINC(ipv6, , idev, field); })
#define IP6_INC_STATS_BH(net, idev,field) ({ (void)(net); \
_DEVINC(ipv6, _BH, idev, field); })
-#define IP6_ADD_STATS_BH(idev,field,val) _DEVADD(ipv6, _BH, idev, field, val)
+#define IP6_ADD_STATS_BH(net, idev,field,val) ({ (void)(net); \
+ _DEVADD(ipv6, _BH, idev, field, val); })
DECLARE_SNMP_STAT(struct icmpv6_mib, icmpv6_statistics);
DECLARE_SNMP_STAT(struct icmpv6msg_mib, icmpv6msg_statistics);
diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
index 693d20836b3f..af12de071f4c 100644
--- a/net/ipv6/reassembly.c
+++ b/net/ipv6/reassembly.c
@@ -189,7 +189,7 @@ static void ip6_evictor(struct net *net, struct inet6_dev *idev)
evicted = inet_frag_evictor(&net->ipv6.frags, &ip6_frags);
if (evicted)
- IP6_ADD_STATS_BH(idev, IPSTATS_MIB_REASMFAILS, evicted);
+ IP6_ADD_STATS_BH(net, idev, IPSTATS_MIB_REASMFAILS, evicted);
}
static void ip6_frag_expire(unsigned long data)