aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis V. Lunev <den@openvz.org>2008-10-08 10:34:54 -0700
committerDavid S. Miller <davem@davemloft.net>2008-10-08 11:15:46 -0700
commit55d43808eb26e689dacb95b11f956a3b1a56a5f3 (patch)
tree952e6111369f95ab5c25e41c439823966590ecec
parenta712d3e859b78edc44d5664d867626d3022bd18e (diff)
downloadkernel_samsung_smdk4412-55d43808eb26e689dacb95b11f956a3b1a56a5f3.zip
kernel_samsung_smdk4412-55d43808eb26e689dacb95b11f956a3b1a56a5f3.tar.gz
kernel_samsung_smdk4412-55d43808eb26e689dacb95b11f956a3b1a56a5f3.tar.bz2
ipv6: added net argument to ICMP6MSGIN_INC_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.h4
-rw-r--r--net/ipv6/icmp.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index 01da23c..47a76bf 100644
--- a/include/net/ipv6.h
+++ b/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/net/ipv6/icmp.c b/net/ipv6/icmp.c
index 4c96155..9b7d19a 100644
--- a/net/ipv6/icmp.c
+++ b/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: