[SK_BUFF]: Introduce ip_hdr(), remove skb->nh.iph

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

5 files changed, 10 insertions, 10 deletions

diff --git a/net/sctp/input.c b/net/sctp/input.c
index 2b0863aba3fb..595fe32b3d41 100644
--- a/net/sctp/input.c
+++ b/net/sctp/input.c
@@ -154,7 +154,7 @@ int sctp_rcv(struct sk_buff *skb)
         if (skb->len < sizeof(struct sctp_chunkhdr))
                 goto discard_it;
 
-        family = ipver2af(skb->nh.iph->version);
+        family = ipver2af(ip_hdr(skb)->version);
         af = sctp_get_af_specific(family);
         if (unlikely(!af))
                 goto discard_it;
diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c
index 5f9b145b0b90..742f9ff42fbf 100644
--- a/net/sctp/ipv6.c
+++ b/net/sctp/ipv6.c
@@ -770,9 +770,9 @@ static void sctp_inet6_skb_msgname(struct sk_buff *skb, char *msgname,
 
                 /* Map ipv4 address into v4-mapped-on-v6 address. */
                 if (sctp_sk(skb->sk)->v4mapped &&
-                    skb->nh.iph->version == 4) {
+                    ip_hdr(skb)->version == 4) {
                         sctp_v4_map_v6((union sctp_addr *)sin6);
-                        sin6->sin6_addr.s6_addr32[3] = skb->nh.iph->saddr;
+                        sin6->sin6_addr.s6_addr32[3] = ip_hdr(skb)->saddr;
                         return;
                 }
 
diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c
index e17a823ca90f..08f92ba4ebd7 100644
--- a/net/sctp/protocol.c
+++ b/net/sctp/protocol.c
@@ -238,10 +238,10 @@ static void sctp_v4_from_skb(union sctp_addr *addr, struct sk_buff *skb,
         sh = (struct sctphdr *) skb->h.raw;
         if (is_saddr) {
                 *port  = sh->source;
-                from = &skb->nh.iph->saddr;
+                from = &ip_hdr(skb)->saddr;
         } else {
                 *port = sh->dest;
-                from = &skb->nh.iph->daddr;
+                from = &ip_hdr(skb)->daddr;
         }
         memcpy(&addr->v4.sin_addr.s_addr, from, sizeof(struct in_addr));
 }
@@ -530,7 +530,7 @@ static int sctp_v4_skb_iif(const struct sk_buff *skb)
 /* Was this packet marked by Explicit Congestion Notification? */
 static int sctp_v4_is_ce(const struct sk_buff *skb)
 {
-        return INET_ECN_is_ce(skb->nh.iph->tos);
+        return INET_ECN_is_ce(ip_hdr(skb)->tos);
 }
 
 /* Create and initialize a new sk for the socket returned by accept(). */
@@ -739,7 +739,7 @@ static void sctp_inet_skb_msgname(struct sk_buff *skb, char *msgname, int *len)
                 sin = (struct sockaddr_in *)msgname;
                 sh = (struct sctphdr *)skb->h.raw;
                 sin->sin_port = sh->source;
-                sin->sin_addr.s_addr = skb->nh.iph->saddr;
+                sin->sin_addr.s_addr = ip_hdr(skb)->saddr;
         }
 }
 
diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c
index f7fb29d5a0c7..60c5b59d4c65 100644
--- a/net/sctp/sm_make_chunk.c
+++ b/net/sctp/sm_make_chunk.c
@@ -86,7 +86,7 @@ int sctp_chunk_iif(const struct sctp_chunk *chunk)
         struct sctp_af *af;
         int iif = 0;
 
-        af = sctp_get_af_specific(ipver2af(chunk->skb->nh.iph->version));
+        af = sctp_get_af_specific(ipver2af(ip_hdr(chunk->skb)->version));
         if (af)
                 iif = af->skb_iif(chunk->skb);
 
@@ -1233,7 +1233,7 @@ struct sctp_association *sctp_make_temp_asoc(const struct sctp_endpoint *ep,
         asoc->temp = 1;
         skb = chunk->skb;
         /* Create an entry for the source address of the packet.  */
-        af = sctp_get_af_specific(ipver2af(skb->nh.iph->version));
+        af = sctp_get_af_specific(ipver2af(ip_hdr(skb)->version));
         if (unlikely(!af))
                 goto fail;
         af->from_skb(&asoc->c.peer_addr, skb, 1);
diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c
index e9097cf614ba..bf502c499c81 100644
--- a/net/sctp/sm_statefuns.c
+++ b/net/sctp/sm_statefuns.c
@@ -5286,7 +5286,7 @@ static int sctp_eat_data(const struct sctp_association *asoc,
                 chunk->ecn_ce_done = 1;
 
                 af = sctp_get_af_specific(
-                        ipver2af(chunk->skb->nh.iph->version));
+                        ipver2af(ip_hdr(chunk->skb)->version));
 
                 if (af && af->is_ce(chunk->skb) && asoc->peer.ecn_capable) {
                         /* Do real work as sideffect. */