ipv6: added net argument to IP6_ADD_STATS_BH
authorDenis V. Lunev <den@openvz.org>
Wed, 8 Oct 2008 17:32:43 +0000 (10:32 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 8 Oct 2008 18:13:31 +0000 (11:13 -0700)
Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/net/ipv6.h
net/ipv6/reassembly.c

index e7732d3a3f92c53b92526b61acfc8559e91554c2..ac0487bab8b1ab85fefbff0cd71b48788ca77a7f 100644 (file)
@@ -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);
index 693d20836b3fc59d3d0033e37b445cedf62b9517..af12de071f4c524c3f6349d982d7fd3dbb97e5a6 100644 (file)
@@ -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)