diff options
-rw-r--r-- | include/net/ipv6.h | 4 | ||||
-rw-r--r-- | net/ipv6/mcast.c | 2 | ||||
-rw-r--r-- | net/ipv6/ndisc.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/include/net/ipv6.h b/include/net/ipv6.h index 5107cd92a467..7f5a8dec1ae9 100644 --- a/include/net/ipv6.h +++ b/include/net/ipv6.h | |||
@@ -144,8 +144,8 @@ DECLARE_SNMP_STAT(struct icmpv6msg_mib, icmpv6msg_statistics); | |||
144 | #define ICMP6_INC_STATS_BH(net, idev, field) ({ (void)(net); \ | 144 | #define ICMP6_INC_STATS_BH(net, idev, field) ({ (void)(net); \ |
145 | _DEVINC(icmpv6, _BH, idev, field); }) | 145 | _DEVINC(icmpv6, _BH, idev, field); }) |
146 | 146 | ||
147 | #define ICMP6MSGOUT_INC_STATS(idev, field) \ | 147 | #define ICMP6MSGOUT_INC_STATS(net, idev, field) ({ (void)(net); \ |
148 | _DEVINC(icmpv6msg, , idev, field +256) | 148 | _DEVINC(icmpv6msg, , idev, field +256); }) |
149 | #define ICMP6MSGOUT_INC_STATS_BH(idev, field) \ | 149 | #define ICMP6MSGOUT_INC_STATS_BH(idev, field) \ |
150 | _DEVINC(icmpv6msg, _BH, idev, field +256) | 150 | _DEVINC(icmpv6msg, _BH, idev, field +256) |
151 | #define ICMP6MSGIN_INC_STATS(idev, field) \ | 151 | #define ICMP6MSGIN_INC_STATS(idev, field) \ |
diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c index f06ceea1ffa0..a96e4235fbfa 100644 --- a/net/ipv6/mcast.c +++ b/net/ipv6/mcast.c | |||
@@ -1839,7 +1839,7 @@ static void igmp6_send(struct in6_addr *addr, struct net_device *dev, int type) | |||
1839 | dst_output); | 1839 | dst_output); |
1840 | out: | 1840 | out: |
1841 | if (!err) { | 1841 | if (!err) { |
1842 | ICMP6MSGOUT_INC_STATS(idev, type); | 1842 | ICMP6MSGOUT_INC_STATS(net, idev, type); |
1843 | ICMP6_INC_STATS(net, 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 |
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c index 6ce238ca5387..840b15780a36 100644 --- a/net/ipv6/ndisc.c +++ b/net/ipv6/ndisc.c | |||
@@ -521,7 +521,7 @@ static void __ndisc_send(struct net_device *dev, | |||
521 | err = NF_HOOK(PF_INET6, NF_INET_LOCAL_OUT, skb, NULL, dst->dev, | 521 | err = NF_HOOK(PF_INET6, NF_INET_LOCAL_OUT, skb, NULL, dst->dev, |
522 | dst_output); | 522 | dst_output); |
523 | if (!err) { | 523 | if (!err) { |
524 | ICMP6MSGOUT_INC_STATS(idev, type); | 524 | ICMP6MSGOUT_INC_STATS(net, idev, type); |
525 | ICMP6_INC_STATS(net, idev, ICMP6_MIB_OUTMSGS); | 525 | ICMP6_INC_STATS(net, idev, ICMP6_MIB_OUTMSGS); |
526 | } | 526 | } |
527 | 527 | ||
@@ -1585,7 +1585,7 @@ void ndisc_send_redirect(struct sk_buff *skb, struct neighbour *neigh, | |||
1585 | err = NF_HOOK(PF_INET6, NF_INET_LOCAL_OUT, buff, NULL, dst->dev, | 1585 | err = NF_HOOK(PF_INET6, NF_INET_LOCAL_OUT, buff, NULL, dst->dev, |
1586 | dst_output); | 1586 | dst_output); |
1587 | if (!err) { | 1587 | if (!err) { |
1588 | ICMP6MSGOUT_INC_STATS(idev, NDISC_REDIRECT); | 1588 | ICMP6MSGOUT_INC_STATS(net, idev, NDISC_REDIRECT); |
1589 | ICMP6_INC_STATS(net, idev, ICMP6_MIB_OUTMSGS); | 1589 | ICMP6_INC_STATS(net, idev, ICMP6_MIB_OUTMSGS); |
1590 | } | 1590 | } |
1591 | 1591 | ||