1 files changed, 28 insertions, 20 deletions

diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
index edfe98bf64c3..e9bcce9e7bdf 100644
--- a/net/ipv6/icmp.c
+++ b/net/ipv6/icmp.c
@@ -68,6 +68,7 @@
 #include <asm/system.h>
 
 DEFINE_SNMP_STAT(struct icmpv6_mib, icmpv6_statistics) __read_mostly;
+EXPORT_SYMBOL(icmpv6_statistics);
 
 /*
  *      The ICMP socket(s). This is the most convenient way to flow control
@@ -128,9 +129,9 @@ void icmpv6_param_prob(struct sk_buff *skb, int code, int pos)
 
 static int is_ineligible(struct sk_buff *skb)
 {
-        int ptr = (u8*)(skb->nh.ipv6h+1) - skb->data;
+        int ptr = (u8 *)(ipv6_hdr(skb) + 1) - skb->data;
         int len = skb->len - ptr;
-        __u8 nexthdr = skb->nh.ipv6h->nexthdr;
+        __u8 nexthdr = ipv6_hdr(skb)->nexthdr;
 
         if (len < 0)
                 return 1;
@@ -205,7 +206,7 @@ static __inline__ int opt_unrec(struct sk_buff *skb, __u32 offset)
 {
         u8 _optval, *op;
 
-        offset += skb->nh.raw - skb->data;
+        offset += skb_network_offset(skb);
         op = skb_header_pointer(skb, offset, sizeof(_optval), &_optval);
         if (op == NULL)
                 return 1;
@@ -221,7 +222,7 @@ static int icmpv6_push_pending_frames(struct sock *sk, struct flowi *fl, struct
         if ((skb = skb_peek(&sk->sk_write_queue)) == NULL)
                 goto out;
 
-        icmp6h = (struct icmp6hdr*) skb->h.raw;
+        icmp6h = icmp6_hdr(skb);
         memcpy(icmp6h, thdr, sizeof(struct icmp6hdr));
         icmp6h->icmp6_cksum = 0;
 
@@ -274,7 +275,7 @@ static int icmpv6_getfrag(void *from, char *to, int offset, int len, int odd, st
 #ifdef CONFIG_IPV6_MIP6
 static void mip6_addr_swap(struct sk_buff *skb)
 {
-        struct ipv6hdr *iph = skb->nh.ipv6h;
+        struct ipv6hdr *iph = ipv6_hdr(skb);
         struct inet6_skb_parm *opt = IP6CB(skb);
         struct ipv6_destopt_hao *hao;
         struct in6_addr tmp;
@@ -283,7 +284,8 @@ static void mip6_addr_swap(struct sk_buff *skb)
         if (opt->dsthao) {
                 off = ipv6_find_tlv(skb, opt->dsthao, IPV6_TLV_HAO);
                 if (likely(off >= 0)) {
-                        hao = (struct ipv6_destopt_hao *)(skb->nh.raw + off);
+                        hao = (struct ipv6_destopt_hao *)
+                                        (skb_network_header(skb) + off);
                         ipv6_addr_copy(&tmp, &iph->saddr);
                         ipv6_addr_copy(&iph->saddr, &hao->addr);
                         ipv6_addr_copy(&hao->addr, &tmp);
@@ -301,7 +303,7 @@ void icmpv6_send(struct sk_buff *skb, int type, int code, __u32 info,
                  struct net_device *dev)
 {
         struct inet6_dev *idev = NULL;
-        struct ipv6hdr *hdr = skb->nh.ipv6h;
+        struct ipv6hdr *hdr = ipv6_hdr(skb);
         struct sock *sk;
         struct ipv6_pinfo *np;
         struct in6_addr *saddr = NULL;
@@ -315,7 +317,8 @@ void icmpv6_send(struct sk_buff *skb, int type, int code, __u32 info,
         int hlimit, tclass;
         int err = 0;
 
-        if ((u8*)hdr < skb->head || (u8*)(hdr+1) > skb->tail)
+        if ((u8 *)hdr < skb->head ||
+            (skb->network_header + sizeof(*hdr)) > skb->tail)
                 return;
 
         /*
@@ -430,7 +433,7 @@ void icmpv6_send(struct sk_buff *skb, int type, int code, __u32 info,
                 tclass = 0;
 
         msg.skb = skb;
-        msg.offset = skb->nh.raw - skb->data;
+        msg.offset = skb_network_offset(skb);
         msg.type = type;
 
         len = skb->len - msg.offset;
@@ -466,13 +469,15 @@ out:
         icmpv6_xmit_unlock();
 }
 
+EXPORT_SYMBOL(icmpv6_send);
+
 static void icmpv6_echo_reply(struct sk_buff *skb)
 {
         struct sock *sk;
         struct inet6_dev *idev;
         struct ipv6_pinfo *np;
         struct in6_addr *saddr = NULL;
-        struct icmp6hdr *icmph = (struct icmp6hdr *) skb->h.raw;
+        struct icmp6hdr *icmph = icmp6_hdr(skb);
         struct icmp6hdr tmp_hdr;
         struct flowi fl;
         struct icmpv6_msg msg;
@@ -481,7 +486,7 @@ static void icmpv6_echo_reply(struct sk_buff *skb)
         int hlimit;
         int tclass;
 
-        saddr = &skb->nh.ipv6h->daddr;
+        saddr = &ipv6_hdr(skb)->daddr;
 
         if (!ipv6_unicast_destination(skb))
                 saddr = NULL;
@@ -491,7 +496,7 @@ static void icmpv6_echo_reply(struct sk_buff *skb)
 
         memset(&fl, 0, sizeof(fl));
         fl.proto = IPPROTO_ICMPV6;
-        ipv6_addr_copy(&fl.fl6_dst, &skb->nh.ipv6h->saddr);
+        ipv6_addr_copy(&fl.fl6_dst, &ipv6_hdr(skb)->saddr);
         if (saddr)
                 ipv6_addr_copy(&fl.fl6_src, saddr);
         fl.oif = skb->dev->ifindex;
@@ -579,8 +584,8 @@ static void icmpv6_notify(struct sk_buff *skb, int type, int code, __be32 info)
         if (!pskb_may_pull(skb, inner_offset+8))
                 return;
 
-        saddr = &skb->nh.ipv6h->saddr;
-        daddr = &skb->nh.ipv6h->daddr;
+        saddr = &ipv6_hdr(skb)->saddr;
+        daddr = &ipv6_hdr(skb)->daddr;
 
         /* BUGGG_FUTURE: we should try to parse exthdrs in this packet.
            Without this we will not able f.e. to make source routed
@@ -624,8 +629,8 @@ static int icmpv6_rcv(struct sk_buff **pskb)
 
         ICMP6_INC_STATS_BH(idev, ICMP6_MIB_INMSGS);
 
-        saddr = &skb->nh.ipv6h->saddr;
-        daddr = &skb->nh.ipv6h->daddr;
+        saddr = &ipv6_hdr(skb)->saddr;
+        daddr = &ipv6_hdr(skb)->daddr;
 
         /* Perform checksum. */
         switch (skb->ip_summed) {
@@ -647,7 +652,7 @@ static int icmpv6_rcv(struct sk_buff **pskb)
         if (!pskb_pull(skb, sizeof(struct icmp6hdr)))
                 goto discard_it;
 
-        hdr = (struct icmp6hdr *) skb->h.raw;
+        hdr = icmp6_hdr(skb);
 
         type = hdr->icmp6_type;
 
@@ -673,7 +678,7 @@ static int icmpv6_rcv(struct sk_buff **pskb)
                  */
                 if (!pskb_may_pull(skb, sizeof(struct ipv6hdr)))
                         goto discard_it;
-                hdr = (struct icmp6hdr *) skb->h.raw;
+                hdr = icmp6_hdr(skb);
                 orig_hdr = (struct ipv6hdr *) (hdr + 1);
                 rt6_pmtu_discovery(&orig_hdr->daddr, &orig_hdr->saddr, dev,
                                    ntohl(hdr->icmp6_mtu));
@@ -727,7 +732,8 @@ static int icmpv6_rcv(struct sk_buff **pskb)
                  */
 
                 icmpv6_notify(skb, type, hdr->icmp6_code, hdr->icmp6_mtu);
-        };
+        }
+
         kfree_skb(skb);
         return 0;
 
@@ -860,11 +866,13 @@ int icmpv6_err_convert(int type, int code, int *err)
         case ICMPV6_TIME_EXCEED:
                 *err = EHOSTUNREACH;
                 break;
-        };
+        }
 
         return fatal;
 }
 
+EXPORT_SYMBOL(icmpv6_err_convert);
+
 #ifdef CONFIG_SYSCTL
 ctl_table ipv6_icmp_table[] = {
         {