diff options
Diffstat (limited to 'net/ipv6/mcast.c')
-rw-r--r-- | net/ipv6/mcast.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c index e2ab43c989d4..86d908b1caea 100644 --- a/net/ipv6/mcast.c +++ b/net/ipv6/mcast.c | |||
@@ -1479,10 +1479,11 @@ static void mld_sendpack(struct sk_buff *skb) | |||
1479 | err = NF_HOOK(PF_INET6, NF_IP6_LOCAL_OUT, skb, NULL, skb->dev, | 1479 | err = NF_HOOK(PF_INET6, NF_IP6_LOCAL_OUT, skb, NULL, skb->dev, |
1480 | mld_dev_queue_xmit); | 1480 | mld_dev_queue_xmit); |
1481 | if (!err) { | 1481 | if (!err) { |
1482 | ICMP6_INC_STATS(idev,ICMP6_MIB_OUTMSGS); | 1482 | ICMP6MSGOUT_INC_STATS_BH(idev, ICMPV6_MLD2_REPORT); |
1483 | IP6_INC_STATS(idev, IPSTATS_MIB_OUTMCASTPKTS); | 1483 | ICMP6_INC_STATS_BH(idev, ICMP6_MIB_OUTMSGS); |
1484 | IP6_INC_STATS_BH(idev, IPSTATS_MIB_OUTMCASTPKTS); | ||
1484 | } else | 1485 | } else |
1485 | IP6_INC_STATS(idev, IPSTATS_MIB_OUTDISCARDS); | 1486 | IP6_INC_STATS_BH(idev, IPSTATS_MIB_OUTDISCARDS); |
1486 | 1487 | ||
1487 | if (likely(idev != NULL)) | 1488 | if (likely(idev != NULL)) |
1488 | in6_dev_put(idev); | 1489 | in6_dev_put(idev); |
@@ -1822,10 +1823,7 @@ static void igmp6_send(struct in6_addr *addr, struct net_device *dev, int type) | |||
1822 | err = NF_HOOK(PF_INET6, NF_IP6_LOCAL_OUT, skb, NULL, skb->dev, | 1823 | err = NF_HOOK(PF_INET6, NF_IP6_LOCAL_OUT, skb, NULL, skb->dev, |
1823 | mld_dev_queue_xmit); | 1824 | mld_dev_queue_xmit); |
1824 | if (!err) { | 1825 | if (!err) { |
1825 | if (type == ICMPV6_MGM_REDUCTION) | 1826 | ICMP6MSGOUT_INC_STATS(idev, type); |
1826 | ICMP6_INC_STATS(idev, ICMP6_MIB_OUTGROUPMEMBREDUCTIONS); | ||
1827 | else | ||
1828 | ICMP6_INC_STATS(idev, ICMP6_MIB_OUTGROUPMEMBRESPONSES); | ||
1829 | ICMP6_INC_STATS(idev, ICMP6_MIB_OUTMSGS); | 1827 | ICMP6_INC_STATS(idev, ICMP6_MIB_OUTMSGS); |
1830 | IP6_INC_STATS(idev, IPSTATS_MIB_OUTMCASTPKTS); | 1828 | IP6_INC_STATS(idev, IPSTATS_MIB_OUTMCASTPKTS); |
1831 | } else | 1829 | } else |