diff options
-rw-r--r-- | include/net/ipv6.h | 4 | ||||
-rw-r--r-- | net/ipv6/icmp.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/net/ipv6.h b/include/net/ipv6.h index 01da23c061e3..47a76bfbf763 100644 --- a/include/net/ipv6.h +++ b/include/net/ipv6.h | |||
@@ -148,8 +148,8 @@ DECLARE_SNMP_STAT(struct icmpv6msg_mib, icmpv6msg_statistics); | |||
148 | _DEVINC(icmpv6msg, , idev, field +256); }) | 148 | _DEVINC(icmpv6msg, , idev, field +256); }) |
149 | #define ICMP6MSGOUT_INC_STATS_BH(net, idev, field) ({ (void)(net); \ | 149 | #define ICMP6MSGOUT_INC_STATS_BH(net, idev, field) ({ (void)(net); \ |
150 | _DEVINC(icmpv6msg, _BH, idev, field +256); }) | 150 | _DEVINC(icmpv6msg, _BH, idev, field +256); }) |
151 | #define ICMP6MSGIN_INC_STATS_BH(idev, field) \ | 151 | #define ICMP6MSGIN_INC_STATS_BH(net, idev, field) ({ (void)(net); \ |
152 | _DEVINC(icmpv6msg, _BH, idev, field) | 152 | _DEVINC(icmpv6msg, _BH, idev, field); }) |
153 | 153 | ||
154 | struct ip6_ra_chain | 154 | struct ip6_ra_chain |
155 | { | 155 | { |
diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c index 4c961556306a..9b7d19ae5ced 100644 --- a/net/ipv6/icmp.c +++ b/net/ipv6/icmp.c | |||
@@ -693,7 +693,7 @@ static int icmpv6_rcv(struct sk_buff *skb) | |||
693 | 693 | ||
694 | type = hdr->icmp6_type; | 694 | type = hdr->icmp6_type; |
695 | 695 | ||
696 | ICMP6MSGIN_INC_STATS_BH(idev, type); | 696 | ICMP6MSGIN_INC_STATS_BH(dev_net(dev), idev, type); |
697 | 697 | ||
698 | switch (type) { | 698 | switch (type) { |
699 | case ICMPV6_ECHO_REQUEST: | 699 | case ICMPV6_ECHO_REQUEST: |