1 files changed, 24 insertions, 22 deletions

diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c
index a8d6625ec782..6c2758951d60 100644
--- a/net/ipv6/mcast.c
+++ b/net/ipv6/mcast.c
@@ -988,7 +988,7 @@ int ipv6_is_mld(struct sk_buff *skb, int nexthdr)
         if (!pskb_may_pull(skb, sizeof(struct icmp6hdr)))
                 return 0;
 
-        pic = (struct icmp6hdr *)skb->h.raw;
+        pic = icmp6_hdr(skb);
 
         switch (pic->icmp6_type) {
         case ICMPV6_MGM_QUERY:
@@ -1167,11 +1167,11 @@ int igmp6_event_query(struct sk_buff *skb)
                 return -EINVAL;
 
         /* compute payload length excluding extension headers */
-        len = ntohs(skb->nh.ipv6h->payload_len) + sizeof(struct ipv6hdr);
-        len -= (char *)skb->h.raw - (char *)skb->nh.ipv6h;
+        len = ntohs(ipv6_hdr(skb)->payload_len) + sizeof(struct ipv6hdr);
+        len -= skb_network_header_len(skb);
 
         /* Drop queries with not link local source */
-        if (!(ipv6_addr_type(&skb->nh.ipv6h->saddr)&IPV6_ADDR_LINKLOCAL))
+        if (!(ipv6_addr_type(&ipv6_hdr(skb)->saddr) & IPV6_ADDR_LINKLOCAL))
                 return -EINVAL;
 
         idev = in6_dev_get(skb->dev);
@@ -1179,7 +1179,7 @@ int igmp6_event_query(struct sk_buff *skb)
         if (idev == NULL)
                 return 0;
 
-        hdr = (struct icmp6hdr *) skb->h.raw;
+        hdr = icmp6_hdr(skb);
         group = (struct in6_addr *) (hdr + 1);
         group_type = ipv6_addr_type(group);
 
@@ -1212,7 +1212,7 @@ int igmp6_event_query(struct sk_buff *skb)
                         in6_dev_put(idev);
                         return -EINVAL;
                 }
-                mlh2 = (struct mld2_query *) skb->h.raw;
+                mlh2 = (struct mld2_query *)skb_transport_header(skb);
                 max_delay = (MLDV2_MRC(ntohs(mlh2->mrc))*HZ)/1000;
                 if (!max_delay)
                         max_delay = 1;
@@ -1235,7 +1235,7 @@ int igmp6_event_query(struct sk_buff *skb)
                                 in6_dev_put(idev);
                                 return -EINVAL;
                         }
-                        mlh2 = (struct mld2_query *) skb->h.raw;
+                        mlh2 = (struct mld2_query *)skb_transport_header(skb);
                         mark = 1;
                 }
         } else {
@@ -1300,10 +1300,10 @@ int igmp6_event_report(struct sk_buff *skb)
         if (!pskb_may_pull(skb, sizeof(struct in6_addr)))
                 return -EINVAL;
 
-        hdr = (struct icmp6hdr*) skb->h.raw;
+        hdr = icmp6_hdr(skb);
 
         /* Drop reports with not link local source */
-        addr_type = ipv6_addr_type(&skb->nh.ipv6h->saddr);
+        addr_type = ipv6_addr_type(&ipv6_hdr(skb)->saddr);
         if (addr_type != IPV6_ADDR_ANY &&
             !(addr_type&IPV6_ADDR_LINKLOCAL))
                 return -EINVAL;
@@ -1411,7 +1411,7 @@ static struct sk_buff *mld_newpack(struct net_device *dev, int size)
 
         skb_reserve(skb, LL_RESERVED_SPACE(dev));
 
-        if (ipv6_get_lladdr(dev, &addr_buf)) {
+        if (ipv6_get_lladdr(dev, &addr_buf, IFA_F_TENTATIVE)) {
                 /* <draft-ietf-magma-mld-source-05.txt>:
                  * use unspecified address as the source address
                  * when a valid link-local address is not available.
@@ -1423,8 +1423,9 @@ static struct sk_buff *mld_newpack(struct net_device *dev, int size)
 
         memcpy(skb_put(skb, sizeof(ra)), ra, sizeof(ra));
 
-        pmr =(struct mld2_report *)skb_put(skb, sizeof(*pmr));
-        skb->h.raw = (unsigned char *)pmr;
+        skb_set_transport_header(skb, skb_tail_pointer(skb) - skb->data);
+        skb_put(skb, sizeof(*pmr));
+        pmr = (struct mld2_report *)skb_transport_header(skb);
         pmr->type = ICMPV6_MLD2_REPORT;
         pmr->resv1 = 0;
         pmr->csum = 0;
@@ -1441,7 +1442,7 @@ static inline int mld_dev_queue_xmit2(struct sk_buff *skb)
                 unsigned char ha[MAX_ADDR_LEN];
                 int err;
 
-                ndisc_mc_map(&skb->nh.ipv6h->daddr, ha, dev, 1);
+                ndisc_mc_map(&ipv6_hdr(skb)->daddr, ha, dev, 1);
                 err = dev->hard_header(skb, dev, ETH_P_IPV6, ha, NULL, skb->len);
                 if (err < 0) {
                         kfree_skb(skb);
@@ -1459,20 +1460,21 @@ static inline int mld_dev_queue_xmit(struct sk_buff *skb)
 
 static void mld_sendpack(struct sk_buff *skb)
 {
-        struct ipv6hdr *pip6 = skb->nh.ipv6h;
-        struct mld2_report *pmr = (struct mld2_report *)skb->h.raw;
+        struct ipv6hdr *pip6 = ipv6_hdr(skb);
+        struct mld2_report *pmr =
+                              (struct mld2_report *)skb_transport_header(skb);
         int payload_len, mldlen;
         struct inet6_dev *idev = in6_dev_get(skb->dev);
         int err;
 
         IP6_INC_STATS(idev, IPSTATS_MIB_OUTREQUESTS);
-        payload_len = skb->tail - (unsigned char *)skb->nh.ipv6h -
-                sizeof(struct ipv6hdr);
-        mldlen = skb->tail - skb->h.raw;
+        payload_len = (skb->tail - skb->network_header) - sizeof(*pip6);
+        mldlen = skb->tail - skb->transport_header;
         pip6->payload_len = htons(payload_len);
 
         pmr->csum = csum_ipv6_magic(&pip6->saddr, &pip6->daddr, mldlen,
-                IPPROTO_ICMPV6, csum_partial(skb->h.raw, mldlen, 0));
+                IPPROTO_ICMPV6, csum_partial(skb_transport_header(skb),
+                                             mldlen, 0));
         err = NF_HOOK(PF_INET6, NF_IP6_LOCAL_OUT, skb, NULL, skb->dev,
                 mld_dev_queue_xmit);
         if (!err) {
@@ -1506,7 +1508,7 @@ static struct sk_buff *add_grhead(struct sk_buff *skb, struct ifmcaddr6 *pmc,
         pgr->grec_auxwords = 0;
         pgr->grec_nsrcs = 0;
         pgr->grec_mca = pmc->mca_addr;  /* structure copy */
-        pmr = (struct mld2_report *)skb->h.raw;
+        pmr = (struct mld2_report *)skb_transport_header(skb);
         pmr->ngrec = htons(ntohs(pmr->ngrec)+1);
         *ppgr = pgr;
         return skb;
@@ -1539,7 +1541,7 @@ static struct sk_buff *add_grec(struct sk_buff *skb, struct ifmcaddr6 *pmc,
         if (!*psf_list)
                 goto empty_source;
 
-        pmr = skb ? (struct mld2_report *)skb->h.raw : NULL;
+        pmr = skb ? (struct mld2_report *)skb_transport_header(skb) : NULL;
 
         /* EX and TO_EX get a fresh packet, if needed */
         if (truncate) {
@@ -1791,7 +1793,7 @@ static void igmp6_send(struct in6_addr *addr, struct net_device *dev, int type)
 
         skb_reserve(skb, LL_RESERVED_SPACE(dev));
 
-        if (ipv6_get_lladdr(dev, &addr_buf)) {
+        if (ipv6_get_lladdr(dev, &addr_buf, IFA_F_TENTATIVE)) {
                 /* <draft-ietf-magma-mld-source-05.txt>:
                  * use unspecified address as the source address
                  * when a valid link-local address is not available.