ipv6: added net argument to ICMP6MSGIN_INC_STATS_BH
authorDenis V. Lunev <den@openvz.org>
Wed, 8 Oct 2008 17:34:54 +0000 (10:34 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 8 Oct 2008 18:15:46 +0000 (11:15 -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/icmp.c

index 01da23c061e3673facb49aa2fe8b20aa73a93320..47a76bfbf76303874fdc78b931a699bca7de7e1e 100644 (file)
@@ -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
 {
index 4c961556306a6883efcc3be76211f7c80ea348ac..9b7d19ae5ced5c7aa50dc5e48b98d7d7007c8770 100644 (file)
@@ -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: