[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, 6 insertions, 6 deletions

diff --git a/net/sched/cls_rsvp.h b/net/sched/cls_rsvp.h
index b6ac0e287872..cb8cf5bfa053 100644
--- a/net/sched/cls_rsvp.h
+++ b/net/sched/cls_rsvp.h
@@ -145,7 +145,7 @@ static int rsvp_classify(struct sk_buff *skb, struct tcf_proto *tp,
 #if RSVP_DST_LEN == 4
         struct ipv6hdr *nhptr = skb->nh.ipv6h;
 #else
-        struct iphdr *nhptr = skb->nh.iph;
+        struct iphdr *nhptr = ip_hdr(skb);
 #endif
 
 restart:
diff --git a/net/sched/sch_atm.c b/net/sched/sch_atm.c
index afb3bbd571f2..baca8743c12b 100644
--- a/net/sched/sch_atm.c
+++ b/net/sched/sch_atm.c
@@ -503,7 +503,7 @@ static void sch_atm_dequeue(unsigned long data)
                         }
                         D2PRINTK("atm_tc_dequeue: sending on class %p\n",flow);
                         /* remove any LL header somebody else has attached */
-                        skb_pull(skb,(char *) skb->nh.iph-(char *) skb->data);
+                        skb_pull(skb, skb_network_offset(skb));
                         if (skb_headroom(skb) < flow->hdr_len) {
                                 struct sk_buff *new;
 
@@ -513,7 +513,7 @@ static void sch_atm_dequeue(unsigned long data)
                                 skb = new;
                         }
                         D2PRINTK("sch_atm_dequeue: ip %p, data %p\n",
-                            skb->nh.iph,skb->data);
+                                 skb_network_header(skb), skb->data);
                         ATM_SKB(skb)->vcc = flow->vcc;
                         memcpy(skb_push(skb,flow->hdr_len),flow->hdr,
                             flow->hdr_len);
diff --git a/net/sched/sch_dsmark.c b/net/sched/sch_dsmark.c
index 96324cf4e6a9..45b5734dd72a 100644
--- a/net/sched/sch_dsmark.c
+++ b/net/sched/sch_dsmark.c
@@ -216,7 +216,7 @@ static int dsmark_enqueue(struct sk_buff *skb,struct Qdisc *sch)
                 /* FIXME: Safe with non-linear skbs? --RR */
                 switch (skb->protocol) {
                         case __constant_htons(ETH_P_IP):
-                                skb->tc_index = ipv4_get_dsfield(skb->nh.iph)
+                                skb->tc_index = ipv4_get_dsfield(ip_hdr(skb))
                                         & ~INET_ECN_MASK;
                                 break;
                         case __constant_htons(ETH_P_IPV6):
@@ -292,7 +292,7 @@ static struct sk_buff *dsmark_dequeue(struct Qdisc *sch)
 
         switch (skb->protocol) {
                 case __constant_htons(ETH_P_IP):
-                        ipv4_change_dsfield(skb->nh.iph, p->mask[index],
+                        ipv4_change_dsfield(ip_hdr(skb), p->mask[index],
                                             p->value[index]);
                         break;
                 case __constant_htons(ETH_P_IPV6):
diff --git a/net/sched/sch_sfq.c b/net/sched/sch_sfq.c
index 66f32051a99b..02081bc9e0d1 100644
--- a/net/sched/sch_sfq.c
+++ b/net/sched/sch_sfq.c
@@ -137,7 +137,7 @@ static unsigned sfq_hash(struct sfq_sched_data *q, struct sk_buff *skb)
         switch (skb->protocol) {
         case __constant_htons(ETH_P_IP):
         {
-                struct iphdr *iph = skb->nh.iph;
+                const struct iphdr *iph = ip_hdr(skb);
                 h = iph->daddr;
                 h2 = iph->saddr^iph->protocol;
                 if (!(iph->frag_off&htons(IP_MF|IP_OFFSET)) &&