diff options
-rw-r--r-- | include/net/ipv6.h | 3 | ||||
-rw-r--r-- | net/ipv6/mcast.c | 2 | ||||
-rw-r--r-- | net/ipv6/ndisc.c | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/include/net/ipv6.h b/include/net/ipv6.h index ac0487bab8b1..744fe7443cb9 100644 --- a/include/net/ipv6.h +++ b/include/net/ipv6.h | |||
@@ -139,7 +139,8 @@ DECLARE_SNMP_STAT(struct ipstats_mib, ipv6_statistics); | |||
139 | DECLARE_SNMP_STAT(struct icmpv6_mib, icmpv6_statistics); | 139 | DECLARE_SNMP_STAT(struct icmpv6_mib, icmpv6_statistics); |
140 | DECLARE_SNMP_STAT(struct icmpv6msg_mib, icmpv6msg_statistics); | 140 | DECLARE_SNMP_STAT(struct icmpv6msg_mib, icmpv6msg_statistics); |
141 | 141 | ||
142 | #define ICMP6_INC_STATS(idev, field) _DEVINC(icmpv6, , idev, field) | 142 | #define ICMP6_INC_STATS(net, idev, field) ({ (void)(net); \ |
143 | _DEVINC(icmpv6, , idev, field); }) | ||
143 | #define ICMP6_INC_STATS_BH(idev, field) _DEVINC(icmpv6, _BH, idev, field) | 144 | #define ICMP6_INC_STATS_BH(idev, field) _DEVINC(icmpv6, _BH, idev, field) |
144 | 145 | ||
145 | #define ICMP6MSGOUT_INC_STATS(idev, field) \ | 146 | #define ICMP6MSGOUT_INC_STATS(idev, field) \ |
diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c index 88811ebbe4be..fa413afeb994 100644 --- a/net/ipv6/mcast.c +++ b/net/ipv6/mcast.c | |||
@@ -1840,7 +1840,7 @@ static void igmp6_send(struct in6_addr *addr, struct net_device *dev, int type) | |||
1840 | out: | 1840 | out: |
1841 | if (!err) { | 1841 | if (!err) { |
1842 | ICMP6MSGOUT_INC_STATS(idev, type); | 1842 | ICMP6MSGOUT_INC_STATS(idev, type); |
1843 | ICMP6_INC_STATS(idev, ICMP6_MIB_OUTMSGS); | 1843 | ICMP6_INC_STATS(net, idev, ICMP6_MIB_OUTMSGS); |
1844 | IP6_INC_STATS(net, idev, IPSTATS_MIB_OUTMCASTPKTS); | 1844 | IP6_INC_STATS(net, idev, IPSTATS_MIB_OUTMCASTPKTS); |
1845 | } else | 1845 | } else |
1846 | IP6_INC_STATS(net, idev, IPSTATS_MIB_OUTDISCARDS); | 1846 | IP6_INC_STATS(net, idev, IPSTATS_MIB_OUTDISCARDS); |
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c index ce5b61763fd0..6ce238ca5387 100644 --- a/net/ipv6/ndisc.c +++ b/net/ipv6/ndisc.c | |||
@@ -522,7 +522,7 @@ static void __ndisc_send(struct net_device *dev, | |||
522 | dst_output); | 522 | dst_output); |
523 | if (!err) { | 523 | if (!err) { |
524 | ICMP6MSGOUT_INC_STATS(idev, type); | 524 | ICMP6MSGOUT_INC_STATS(idev, type); |
525 | ICMP6_INC_STATS(idev, ICMP6_MIB_OUTMSGS); | 525 | ICMP6_INC_STATS(net, idev, ICMP6_MIB_OUTMSGS); |
526 | } | 526 | } |
527 | 527 | ||
528 | if (likely(idev != NULL)) | 528 | if (likely(idev != NULL)) |
@@ -1586,7 +1586,7 @@ void ndisc_send_redirect(struct sk_buff *skb, struct neighbour *neigh, | |||
1586 | dst_output); | 1586 | dst_output); |
1587 | if (!err) { | 1587 | if (!err) { |
1588 | ICMP6MSGOUT_INC_STATS(idev, NDISC_REDIRECT); | 1588 | ICMP6MSGOUT_INC_STATS(idev, NDISC_REDIRECT); |
1589 | ICMP6_INC_STATS(idev, ICMP6_MIB_OUTMSGS); | 1589 | ICMP6_INC_STATS(net, idev, ICMP6_MIB_OUTMSGS); |
1590 | } | 1590 | } |
1591 | 1591 | ||
1592 | if (likely(idev != NULL)) | 1592 | if (likely(idev != NULL)) |