diff options
Diffstat (limited to 'net/ipv6/mcast.c')
-rw-r--r-- | net/ipv6/mcast.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c index e7c03bcc2788..d7b3c6d398ae 100644 --- a/net/ipv6/mcast.c +++ b/net/ipv6/mcast.c | |||
@@ -1446,7 +1446,7 @@ static void mld_sendpack(struct sk_buff *skb) | |||
1446 | int err; | 1446 | int err; |
1447 | struct flowi fl; | 1447 | struct flowi fl; |
1448 | 1448 | ||
1449 | IP6_INC_STATS(idev, IPSTATS_MIB_OUTREQUESTS); | 1449 | IP6_INC_STATS(net, idev, IPSTATS_MIB_OUTREQUESTS); |
1450 | payload_len = (skb->tail - skb->network_header) - sizeof(*pip6); | 1450 | payload_len = (skb->tail - skb->network_header) - sizeof(*pip6); |
1451 | mldlen = skb->tail - skb->transport_header; | 1451 | mldlen = skb->tail - skb->transport_header; |
1452 | pip6->payload_len = htons(payload_len); | 1452 | pip6->payload_len = htons(payload_len); |
@@ -1474,11 +1474,11 @@ static void mld_sendpack(struct sk_buff *skb) | |||
1474 | dst_output); | 1474 | dst_output); |
1475 | out: | 1475 | out: |
1476 | if (!err) { | 1476 | if (!err) { |
1477 | ICMP6MSGOUT_INC_STATS_BH(idev, ICMPV6_MLD2_REPORT); | 1477 | ICMP6MSGOUT_INC_STATS_BH(net, idev, ICMPV6_MLD2_REPORT); |
1478 | ICMP6_INC_STATS_BH(idev, ICMP6_MIB_OUTMSGS); | 1478 | ICMP6_INC_STATS_BH(net, idev, ICMP6_MIB_OUTMSGS); |
1479 | IP6_INC_STATS_BH(idev, IPSTATS_MIB_OUTMCASTPKTS); | 1479 | IP6_INC_STATS_BH(net, idev, IPSTATS_MIB_OUTMCASTPKTS); |
1480 | } else | 1480 | } else |
1481 | IP6_INC_STATS_BH(idev, IPSTATS_MIB_OUTDISCARDS); | 1481 | IP6_INC_STATS_BH(net, idev, IPSTATS_MIB_OUTDISCARDS); |
1482 | 1482 | ||
1483 | if (likely(idev != NULL)) | 1483 | if (likely(idev != NULL)) |
1484 | in6_dev_put(idev); | 1484 | in6_dev_put(idev); |
@@ -1771,7 +1771,7 @@ static void igmp6_send(struct in6_addr *addr, struct net_device *dev, int type) | |||
1771 | struct flowi fl; | 1771 | struct flowi fl; |
1772 | 1772 | ||
1773 | rcu_read_lock(); | 1773 | rcu_read_lock(); |
1774 | IP6_INC_STATS(__in6_dev_get(dev), | 1774 | IP6_INC_STATS(net, __in6_dev_get(dev), |
1775 | IPSTATS_MIB_OUTREQUESTS); | 1775 | IPSTATS_MIB_OUTREQUESTS); |
1776 | rcu_read_unlock(); | 1776 | rcu_read_unlock(); |
1777 | if (type == ICMPV6_MGM_REDUCTION) | 1777 | if (type == ICMPV6_MGM_REDUCTION) |
@@ -1787,7 +1787,7 @@ static void igmp6_send(struct in6_addr *addr, struct net_device *dev, int type) | |||
1787 | 1787 | ||
1788 | if (skb == NULL) { | 1788 | if (skb == NULL) { |
1789 | rcu_read_lock(); | 1789 | rcu_read_lock(); |
1790 | IP6_INC_STATS(__in6_dev_get(dev), | 1790 | IP6_INC_STATS(net, __in6_dev_get(dev), |
1791 | IPSTATS_MIB_OUTDISCARDS); | 1791 | IPSTATS_MIB_OUTDISCARDS); |
1792 | rcu_read_unlock(); | 1792 | rcu_read_unlock(); |
1793 | return; | 1793 | return; |
@@ -1839,11 +1839,11 @@ 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(idev, ICMP6_MIB_OUTMSGS); | 1843 | ICMP6_INC_STATS(net, idev, ICMP6_MIB_OUTMSGS); |
1844 | IP6_INC_STATS(idev, IPSTATS_MIB_OUTMCASTPKTS); | 1844 | IP6_INC_STATS(net, idev, IPSTATS_MIB_OUTMCASTPKTS); |
1845 | } else | 1845 | } else |
1846 | IP6_INC_STATS(idev, IPSTATS_MIB_OUTDISCARDS); | 1846 | IP6_INC_STATS(net, idev, IPSTATS_MIB_OUTDISCARDS); |
1847 | 1847 | ||
1848 | if (likely(idev != NULL)) | 1848 | if (likely(idev != NULL)) |
1849 | in6_dev_put(idev); | 1849 | in6_dev_put(idev); |