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

10 files changed, 51 insertions, 53 deletions

diff --git a/net/ipv4/ipvs/ip_vs_app.c b/net/ipv4/ipvs/ip_vs_app.c
index e5beab28cd..c8a822c0aa 100644
--- a/net/ipv4/ipvs/ip_vs_app.c
+++ b/net/ipv4/ipvs/ip_vs_app.c
@@ -577,7 +577,6 @@ static const struct file_operations ip_vs_app_fops = {
 int ip_vs_skb_replace(struct sk_buff *skb, gfp_t pri,
                       char *o_buf, int o_len, char *n_buf, int n_len)
 {
-        struct iphdr *iph;
         int diff;
         int o_offset;
         int o_left;
@@ -607,8 +606,7 @@ int ip_vs_skb_replace(struct sk_buff *skb, gfp_t pri,
         }
 
         /* must update the iph total length here */
-        iph = skb->nh.iph;
-        iph->tot_len = htons(skb->len);
+        ip_hdr(skb)->tot_len = htons(skb->len);
 
         LeaveFunction(9);
         return 0;
diff --git a/net/ipv4/ipvs/ip_vs_core.c b/net/ipv4/ipvs/ip_vs_core.c
index 7893c00a91..62cfbed317 100644
--- a/net/ipv4/ipvs/ip_vs_core.c
+++ b/net/ipv4/ipvs/ip_vs_core.c
@@ -212,7 +212,7 @@ ip_vs_sched_persist(struct ip_vs_service *svc,
                     __be16 ports[2])
 {
         struct ip_vs_conn *cp = NULL;
-        struct iphdr *iph = skb->nh.iph;
+        struct iphdr *iph = ip_hdr(skb);
         struct ip_vs_dest *dest;
         struct ip_vs_conn *ct;
         __be16  dport;   /* destination port to forward */
@@ -381,7 +381,7 @@ struct ip_vs_conn *
 ip_vs_schedule(struct ip_vs_service *svc, const struct sk_buff *skb)
 {
         struct ip_vs_conn *cp = NULL;
-        struct iphdr *iph = skb->nh.iph;
+        struct iphdr *iph = ip_hdr(skb);
         struct ip_vs_dest *dest;
         __be16 _ports[2], *pptr;
 
@@ -447,7 +447,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,
                 struct ip_vs_protocol *pp)
 {
         __be16 _ports[2], *pptr;
-        struct iphdr *iph = skb->nh.iph;
+        struct iphdr *iph = ip_hdr(skb);
 
         pptr = skb_header_pointer(skb, iph->ihl*4,
                                   sizeof(_ports), _ports);
@@ -546,7 +546,7 @@ ip_vs_gather_frags(struct sk_buff *skb, u_int32_t user)
 {
         skb = ip_defrag(skb, user);
         if (skb)
-                ip_send_check(skb->nh.iph);
+                ip_send_check(ip_hdr(skb));
         return skb;
 }
 
@@ -557,7 +557,7 @@ ip_vs_gather_frags(struct sk_buff *skb, u_int32_t user)
 void ip_vs_nat_icmp(struct sk_buff *skb, struct ip_vs_protocol *pp,
                     struct ip_vs_conn *cp, int inout)
 {
-        struct iphdr *iph        = skb->nh.iph;
+        struct iphdr *iph        = ip_hdr(skb);
         unsigned int icmp_offset = iph->ihl*4;
         struct icmphdr *icmph    = (struct icmphdr *)(skb_network_header(skb) +
                                                       icmp_offset);
@@ -618,14 +618,14 @@ static int ip_vs_out_icmp(struct sk_buff **pskb, int *related)
         *related = 1;
 
         /* reassemble IP fragments */
-        if (skb->nh.iph->frag_off & htons(IP_MF|IP_OFFSET)) {
+        if (ip_hdr(skb)->frag_off & htons(IP_MF | IP_OFFSET)) {
                 skb = ip_vs_gather_frags(skb, IP_DEFRAG_VS_OUT);
                 if (!skb)
                         return NF_STOLEN;
                 *pskb = skb;
         }
 
-        iph = skb->nh.iph;
+        iph = ip_hdr(skb);
         offset = ihl = iph->ihl * 4;
         ic = skb_header_pointer(skb, offset, sizeof(_icmph), &_icmph);
         if (ic == NULL)
@@ -740,14 +740,14 @@ ip_vs_out(unsigned int hooknum, struct sk_buff **pskb,
         if (skb->ipvs_property)
                 return NF_ACCEPT;
 
-        iph = skb->nh.iph;
+        iph = ip_hdr(skb);
         if (unlikely(iph->protocol == IPPROTO_ICMP)) {
                 int related, verdict = ip_vs_out_icmp(pskb, &related);
 
                 if (related)
                         return verdict;
                 skb = *pskb;
-                iph = skb->nh.iph;
+                iph = ip_hdr(skb);
         }
 
         pp = ip_vs_proto_get(iph->protocol);
@@ -760,7 +760,7 @@ ip_vs_out(unsigned int hooknum, struct sk_buff **pskb,
                 skb = ip_vs_gather_frags(skb, IP_DEFRAG_VS_OUT);
                 if (!skb)
                         return NF_STOLEN;
-                iph = skb->nh.iph;
+                iph = ip_hdr(skb);
                 *pskb = skb;
         }
 
@@ -810,8 +810,8 @@ ip_vs_out(unsigned int hooknum, struct sk_buff **pskb,
         if (pp->snat_handler && !pp->snat_handler(pskb, pp, cp))
                 goto drop;
         skb = *pskb;
-        skb->nh.iph->saddr = cp->vaddr;
-        ip_send_check(skb->nh.iph);
+        ip_hdr(skb)->saddr = cp->vaddr;
+        ip_send_check(ip_hdr(skb));
 
         /* For policy routing, packets originating from this
          * machine itself may be routed differently to packets
@@ -861,7 +861,7 @@ ip_vs_in_icmp(struct sk_buff **pskb, int *related, unsigned int hooknum)
         *related = 1;
 
         /* reassemble IP fragments */
-        if (skb->nh.iph->frag_off & htons(IP_MF|IP_OFFSET)) {
+        if (ip_hdr(skb)->frag_off & htons(IP_MF | IP_OFFSET)) {
                 skb = ip_vs_gather_frags(skb,
                                          hooknum == NF_IP_LOCAL_IN ?
                                          IP_DEFRAG_VS_IN : IP_DEFRAG_VS_FWD);
@@ -870,7 +870,7 @@ ip_vs_in_icmp(struct sk_buff **pskb, int *related, unsigned int hooknum)
                 *pskb = skb;
         }
 
-        iph = skb->nh.iph;
+        iph = ip_hdr(skb);
         offset = ihl = iph->ihl * 4;
         ic = skb_header_pointer(skb, offset, sizeof(_icmph), &_icmph);
         if (ic == NULL)
@@ -966,19 +966,19 @@ ip_vs_in(unsigned int hooknum, struct sk_buff **pskb,
                      || skb->dev == &loopback_dev || skb->sk)) {
                 IP_VS_DBG(12, "packet type=%d proto=%d daddr=%d.%d.%d.%d ignored\n",
                           skb->pkt_type,
-                          skb->nh.iph->protocol,
-                          NIPQUAD(skb->nh.iph->daddr));
+                          ip_hdr(skb)->protocol,
+                          NIPQUAD(ip_hdr(skb)->daddr));
                 return NF_ACCEPT;
         }
 
-        iph = skb->nh.iph;
+        iph = ip_hdr(skb);
         if (unlikely(iph->protocol == IPPROTO_ICMP)) {
                 int related, verdict = ip_vs_in_icmp(pskb, &related, hooknum);