4 files changed, 9 insertions, 9 deletions

diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c
index f429290c2c37..feba6b197fe9 100644
--- a/net/ipv6/datagram.c
+++ b/net/ipv6/datagram.c
@@ -209,7 +209,7 @@ void ipv6_icmp_error(struct sock *sk, struct sk_buff *skb, int err,
                      __be16 port, u32 info, u8 *payload)
 {
         struct ipv6_pinfo *np  = inet6_sk(sk);
-        struct icmp6hdr *icmph = (struct icmp6hdr *)skb->h.raw;
+        struct icmp6hdr *icmph = icmp6_hdr(skb);
         struct sock_exterr_skb *serr;
 
         if (!np->recverr)
diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
index 3a01effda695..d3edc3cf1ce9 100644
--- a/net/ipv6/icmp.c
+++ b/net/ipv6/icmp.c
@@ -222,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;
 
@@ -476,7 +476,7 @@ static void icmpv6_echo_reply(struct sk_buff *skb)
         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;
@@ -651,7 +651,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;
 
@@ -677,7 +677,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));
diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c
index b2b37ba48b9c..1f2a3be9308a 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:
@@ -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);
 
@@ -1300,7 +1300,7 @@ 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(&ipv6_hdr(skb)->saddr);
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index 00feb4c4d98b..8b946f56287a 100644
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -1366,7 +1366,7 @@ static void ndisc_redirect_rcv(struct sk_buff *skb)
                 return;
         }
 
-        icmph = (struct icmp6hdr *) skb->h.raw;
+        icmph = icmp6_hdr(skb);
         target = (struct in6_addr *) (icmph + 1);
         dest = target + 1;