[SK_BUFF]: Introduce icmp_hdr(), remove skb->h.icmph

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 6 insertions, 6 deletions

diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
index b7f6ff4705b0..b32b50114806 100644
--- a/net/ipv4/ipip.c
+++ b/net/ipv4/ipip.c
@@ -280,8 +280,8 @@ static int ipip_err(struct sk_buff *skb, u32 info)
    ICMP in the real Internet is absolutely infeasible.
  */
         struct iphdr *iph = (struct iphdr*)skb->data;
-        int type = skb->h.icmph->type;
-        int code = skb->h.icmph->code;
+        const int type = icmp_hdr(skb)->type;
+        const int code = icmp_hdr(skb)->code;
         struct ip_tunnel *t;
         int err;
 
@@ -336,8 +336,8 @@ out:
         struct iphdr *iph = (struct iphdr*)dp;
         int hlen = iph->ihl<<2;
         struct iphdr *eiph;
-        int type = skb->h.icmph->type;
-        int code = skb->h.icmph->code;
+        const int type = icmp_hdr(skb)->type;
+        const int code = icmp_hdr(skb)->code;
         int rel_type = 0;
         int rel_code = 0;
         __be32 rel_info = 0;
@@ -354,7 +354,7 @@ out:
         default:
                 return 0;
         case ICMP_PARAMETERPROB:
-                n = ntohl(skb->h.icmph->un.gateway) >> 24;
+                n = ntohl(icmp_hdr(skb)->un.gateway) >> 24;
                 if (n < hlen)
                         return 0;
 
@@ -373,7 +373,7 @@ out:
                         return 0;
                 case ICMP_FRAG_NEEDED:
                         /* And it is the only really necessary thing :-) */
-                        n = ntohs(skb->h.icmph->un.frag.mtu);
+                        n = ntohs(icmp_hdr(skb)->un.frag.mtu);
                         if (n < hlen+68)
                                 return 0;
                         n -= hlen;