[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>

4 files changed, 8 insertions, 9 deletions

diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c
index 7a86db6163e..ac95d3bfdfb 100644
--- a/net/ipv6/datagram.c
+++ b/net/ipv6/datagram.c
@@ -349,8 +349,7 @@ int ipv6_recv_error(struct sock *sk, struct msghdr *msg, int len)
                         struct inet_sock *inet = inet_sk(sk);
 
                         ipv6_addr_set(&sin->sin6_addr, 0, 0,
-                                      htonl(0xffff),
-                                      skb->nh.iph->saddr);
+                                      htonl(0xffff), ip_hdr(skb)->saddr);
                         if (inet->cmsg_flags)
                                 ip_cmsg_recv(msg, skb);
                 }
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index aafbdfa8d78..bb65779be7a 100644
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -526,7 +526,7 @@ ip4ip6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
         skb2->dst = NULL;
         skb_pull(skb2, offset);
         skb_reset_network_header(skb2);
-        eiph = skb2->nh.iph;
+        eiph = ip_hdr(skb2);
 
         /* Try to guess incoming interface */
         memset(&fl, 0, sizeof(fl));
@@ -625,10 +625,10 @@ static void ip4ip6_dscp_ecn_decapsulate(struct ip6_tnl *t,
         __u8 dsfield = ipv6_get_dsfield(ipv6h) & ~INET_ECN_MASK;
 
         if (t->parms.flags & IP6_TNL_F_RCV_DSCP_COPY)
-                ipv4_change_dsfield(skb->nh.iph, INET_ECN_MASK, dsfield);
+                ipv4_change_dsfield(ip_hdr(skb), INET_ECN_MASK, dsfield);
 
         if (INET_ECN_is_ce(dsfield))
-                IP_ECN_set_ce(skb->nh.iph);
+                IP_ECN_set_ce(ip_hdr(skb));
 }
 
 static void ip6ip6_dscp_ecn_decapsulate(struct ip6_tnl *t,
@@ -944,7 +944,7 @@ static inline int
 ip4ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev)
 {
         struct ip6_tnl *t = netdev_priv(dev);
-        struct iphdr  *iph = skb->nh.iph;
+        struct iphdr  *iph = ip_hdr(skb);
         int encap_limit = -1;
         struct flowi fl;
         __u8 dsfield;
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index 62883d41b6c..e33ac3c3a9c 100644
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -377,7 +377,7 @@ static int ipip6_rcv(struct sk_buff *skb)
         if (!pskb_may_pull(skb, sizeof(struct ipv6hdr)))
                 goto out;
 
-        iph = skb->nh.iph;
+        iph = ip_hdr(skb);
 
         read_lock(&ipip6_lock);
         if ((tunnel = ipip6_tunnel_lookup(iph->saddr, iph->daddr)) != NULL) {
@@ -565,7 +565,7 @@ static int ipip6_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)
          *      Push down and install the IPIP header.
          */
 
-        iph                     =       skb->nh.iph;
+        iph                     =       ip_hdr(skb);
         iph->version            =       4;
         iph->ihl                =       sizeof(struct iphdr)>>2;
         if (mtu > IPV6_MIN_MTU)
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index 87b06a80102..e991e606ab1 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -178,7 +178,7 @@ try_again:
 
                 if (skb->protocol == htons(ETH_P_IP))
                         ipv6_addr_set(&sin6->sin6_addr, 0, 0,
-                                      htonl(0xffff), skb->nh.iph->saddr);
+                                      htonl(0xffff), ip_hdr(skb)->saddr);
                 else {
                         ipv6_addr_copy(&sin6->sin6_addr, &skb->nh.ipv6h->saddr);
                         if (ipv6_addr_type(&sin6->sin6_addr) & IPV6_ADDR_LINKLOCAL)