Merge to Fedora kernel-2.6.6-1.422

[linux-2.6.git] / net / ipv6 / mcast.c

diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c
index 13be016..b351145 100644 (file)
--- a/net/ipv6/mcast.c
+++ b/net/ipv6/mcast.c
@@ -1317,7 +1317,7 @@ static void mld_sendpack(struct sk_buff *skb)
        struct inet6_dev *idev = in6_dev_get(skb->dev);
        int err;
 
-       IP6_INC_STATS(Ip6OutRequests);
+       IP6_INC_STATS(OutRequests);
        payload_len = skb->tail - (unsigned char *)skb->nh.ipv6h -
                sizeof(struct ipv6hdr);
        mldlen = skb->tail - skb->h.raw;
@@ -1329,9 +1329,9 @@ static void mld_sendpack(struct sk_buff *skb)
                dev_queue_xmit);
        if (!err) {
                ICMP6_INC_STATS(idev,Icmp6OutMsgs);
-               IP6_INC_STATS(Ip6OutMcastPkts);
+               IP6_INC_STATS(OutMcastPkts);
        } else
-               IP6_INC_STATS(Ip6OutDiscards);
+               IP6_INC_STATS(OutDiscards);
 
        if (likely(idev != NULL))
                in6_dev_put(idev);
@@ -1613,7 +1613,7 @@ static void igmp6_send(struct in6_addr *addr, struct net_device *dev, int type)
                     IPV6_TLV_ROUTERALERT, 2, 0, 0,
                     IPV6_TLV_PADN, 0 };
 
-       IP6_INC_STATS(Ip6OutRequests);
+       IP6_INC_STATS(OutRequests);
        snd_addr = addr;
        if (type == ICMPV6_MGM_REDUCTION) {
                snd_addr = &all_routers;
@@ -1627,7 +1627,7 @@ static void igmp6_send(struct in6_addr *addr, struct net_device *dev, int type)
        skb = sock_alloc_send_skb(sk, LL_RESERVED_SPACE(dev) + full_len, 1, &err);
 
        if (skb == NULL) {
-               IP6_INC_STATS(Ip6OutDiscards);
+               IP6_INC_STATS(OutDiscards);
                return;
        }
 
@@ -1672,16 +1672,16 @@ static void igmp6_send(struct in6_addr *addr, struct net_device *dev, int type)
                else
                        ICMP6_INC_STATS(idev, Icmp6OutGroupMembResponses);
                ICMP6_INC_STATS(idev, Icmp6OutMsgs);
-               IP6_INC_STATS(Ip6OutMcastPkts);
+               IP6_INC_STATS(OutMcastPkts);
        } else
-               IP6_INC_STATS(Ip6OutDiscards);
+               IP6_INC_STATS(OutDiscards);
 
        if (likely(idev != NULL))
                in6_dev_put(idev);
        return;
 
 out:
-       IP6_INC_STATS(Ip6OutDiscards);
+       IP6_INC_STATS(OutDiscards);
        kfree_skb(skb);
 }