[SK_BUFF]: Introduce ipv6_hdr(), remove skb->nh.ipv6h

Now the skb->nh union has just one member, .raw, i.e. it is just like the
skb->mac union, strange, no? I'm just leaving it like that till the transport
layer is done with, when we'll rename skb->mac.raw to skb->mac_header (or
->mac_header_offset?), ditto for ->{h,nh}.

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

1 files changed, 4 insertions, 4 deletions

diff --git a/net/ipv6/ip6_input.c b/net/ipv6/ip6_input.c
index aecc74da0721..9c3c787a21c1 100644
--- a/net/ipv6/ip6_input.c
+++ b/net/ipv6/ip6_input.c
@@ -96,7 +96,7 @@ int ipv6_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt
         if (unlikely(!pskb_may_pull(skb, sizeof(*hdr))))
                 goto err;
 
-        hdr = skb->nh.ipv6h;
+        hdr = ipv6_hdr(skb);
 
         if (hdr->version != 6)
                 goto err;
@@ -116,7 +116,7 @@ int ipv6_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt
                         IP6_INC_STATS_BH(idev, IPSTATS_MIB_INHDRERRORS);
                         goto drop;
                 }
-                hdr = skb->nh.ipv6h;
+                hdr = ipv6_hdr(skb);
         }
 
         if (hdr->nexthdr == NEXTHDR_HOP) {
@@ -183,7 +183,7 @@ resubmit:
 
                         skb_postpull_rcsum(skb, skb_network_header(skb),
                                            skb->h.raw - skb->nh.raw);
-                        hdr = skb->nh.ipv6h;
+                        hdr = ipv6_hdr(skb);
                         if (ipv6_addr_is_multicast(&hdr->daddr) &&
                             !ipv6_chk_mcast_addr(skb->dev, &hdr->daddr,
                             &hdr->saddr) &&
@@ -234,7 +234,7 @@ int ip6_mc_input(struct sk_buff *skb)
 
         IP6_INC_STATS_BH(ip6_dst_idev(skb->dst), IPSTATS_MIB_INMCASTPKTS);
 
-        hdr = skb->nh.ipv6h;
+        hdr = ipv6_hdr(skb);
         deliver = likely(!(skb->dev->flags & (IFF_PROMISC|IFF_ALLMULTI))) ||
             ipv6_chk_mcast_addr(skb->dev, &hdr->daddr, NULL);