patch-2_6_7-vs1_9_1_12

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

diff --git a/net/ipv6/ip6_input.c b/net/ipv6/ip6_input.c
index a274679..0be5945 100644 (file)
--- a/net/ipv6/ip6_input.c
+++ b/net/ipv6/ip6_input.c
@@ -64,23 +64,23 @@ int ipv6_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt
        if (skb->pkt_type == PACKET_OTHERHOST)
                goto drop;
 
-       IP6_INC_STATS_BH(Ip6InReceives);
+       IP6_INC_STATS_BH(InReceives);
 
        if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL) {
-               IP6_INC_STATS_BH(Ip6InDiscards);
+               IP6_INC_STATS_BH(InDiscards);
                goto out;
        }
 
        /* Store incoming device index. When the packet will
           be queued, we cannot refer to skb->dev anymore.
         */
-       ((struct inet6_skb_parm *)skb->cb)->iif = dev->ifindex;
+       IP6CB(skb)->iif = dev->ifindex;
 
        if (skb->len < sizeof(struct ipv6hdr))
                goto err;
 
        if (!pskb_may_pull(skb, sizeof(struct ipv6hdr))) {
-               IP6_INC_STATS_BH(Ip6InHdrErrors);
+               IP6_INC_STATS_BH(InHdrErrors);
                goto drop;
        }
 
@@ -97,7 +97,7 @@ int ipv6_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt
                        goto truncated;
                if (pkt_len + sizeof(struct ipv6hdr) < skb->len) {
                        if (__pskb_trim(skb, pkt_len + sizeof(struct ipv6hdr))){
-                               IP6_INC_STATS_BH(Ip6InHdrErrors);
+                               IP6_INC_STATS_BH(InHdrErrors);
                                goto drop;
                        }
                        hdr = skb->nh.ipv6h;
@@ -109,7 +109,7 @@ int ipv6_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt
        if (hdr->nexthdr == NEXTHDR_HOP) {
                skb->h.raw = (u8*)(hdr+1);
                if (ipv6_parse_hopopts(skb, offsetof(struct ipv6hdr, nexthdr)) < 0) {
-                       IP6_INC_STATS_BH(Ip6InHdrErrors);
+                       IP6_INC_STATS_BH(InHdrErrors);
                        return 0;
                }
                hdr = skb->nh.ipv6h;
@@ -117,9 +117,9 @@ int ipv6_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt
 
        return NF_HOOK(PF_INET6,NF_IP6_PRE_ROUTING, skb, dev, NULL, ip6_rcv_finish);
 truncated:
-       IP6_INC_STATS_BH(Ip6InTruncatedPkts);
+       IP6_INC_STATS_BH(InTruncatedPkts);
 err:
-       IP6_INC_STATS_BH(Ip6InHdrErrors);
+       IP6_INC_STATS_BH(InHdrErrors);
 drop:
        kfree_skb(skb);
 out:
@@ -194,15 +194,15 @@ resubmit:
                if (ret > 0)
                        goto resubmit;
                else if (ret == 0)
-                       IP6_INC_STATS_BH(Ip6InDelivers);
+                       IP6_INC_STATS_BH(InDelivers);
        } else {
                if (!raw_sk) {
                        if (xfrm6_policy_check(NULL, XFRM_POLICY_IN, skb)) {
-                               IP6_INC_STATS_BH(Ip6InUnknownProtos);
+                               IP6_INC_STATS_BH(InUnknownProtos);
                                icmpv6_param_prob(skb, ICMPV6_UNK_NEXTHDR, nhoff);
                        }
                } else {
-                       IP6_INC_STATS_BH(Ip6InDelivers);
+                       IP6_INC_STATS_BH(InDelivers);
                        kfree_skb(skb);
                }
        }
@@ -210,7 +210,7 @@ resubmit:
        return 0;
 
 discard:
-       IP6_INC_STATS_BH(Ip6InDiscards);
+       IP6_INC_STATS_BH(InDiscards);
        rcu_read_unlock();
        kfree_skb(skb);
        return 0;
@@ -227,7 +227,7 @@ int ip6_mc_input(struct sk_buff *skb)
        struct ipv6hdr *hdr;
        int deliver;
 
-       IP6_INC_STATS_BH(Ip6InMcastPkts);
+       IP6_INC_STATS_BH(InMcastPkts);
 
        hdr = skb->nh.ipv6h;
        deliver = likely(!(skb->dev->flags & (IFF_PROMISC|IFF_ALLMULTI))) ||