Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ipv6: added net argument to IP6_ADD_STATS_BH

Browse source 
Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Denis V. Lunev 2008-10-08 10:32:43 -07:00 committed by David S. Miller
parent 483a47d2fe
commit 821d57776d
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/net/ipv6.h
View file

@ -133,7 +133,8 @@ DECLARE_SNMP_STAT(struct ipstats_mib, ipv6_statistics);
_DEVINC(ipv6, , idev, field); }) _DEVINC(ipv6, , idev, field); })
#define IP6_INC_STATS_BH(net, idev,field) ({ (void)(net); \ #define IP6_INC_STATS_BH(net, idev,field) ({ (void)(net); \
_DEVINC(ipv6, _BH, idev, field); }) _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 icmpv6_mib, icmpv6_statistics);
DECLARE_SNMP_STAT(struct icmpv6msg_mib, icmpv6msg_statistics); DECLARE_SNMP_STAT(struct icmpv6msg_mib, icmpv6msg_statistics);

2
net/ipv6/reassembly.c
View 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); evicted = inet_frag_evictor(&net->ipv6.frags, &ip6_frags);
if (evicted) 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) static void ip6_frag_expire(unsigned long data)