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

2 files changed, 3 insertions, 3 deletions

diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index 851f46b910f2..969fe31723a7 100644
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@ -535,7 +535,7 @@ static inline void ipgre_ecn_decapsulate(struct iphdr *iph, struct sk_buff *skb)
                 if (skb->protocol == htons(ETH_P_IP)) {
                         IP_ECN_set_ce(ip_hdr(skb));
                 } else if (skb->protocol == htons(ETH_P_IPV6)) {
-                        IP6_ECN_set_ce(skb->nh.ipv6h);
+                        IP6_ECN_set_ce(ipv6_hdr(skb));
                 }
         }
 }
@@ -721,7 +721,7 @@ static int ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)
                         addr_type = ipv6_addr_type(addr6);
 
                         if (addr_type == IPV6_ADDR_ANY) {
-                                addr6 = &skb->nh.ipv6h->daddr;
+                                addr6 = &ipv6_hdr(skb)->daddr;
                                 addr_type = ipv6_addr_type(addr6);
                         }
 
diff --git a/net/ipv4/xfrm4_mode_tunnel.c b/net/ipv4/xfrm4_mode_tunnel.c
index faa1b9a76e76..edba75610a46 100644
--- a/net/ipv4/xfrm4_mode_tunnel.c
+++ b/net/ipv4/xfrm4_mode_tunnel.c
@@ -26,7 +26,7 @@ static inline void ipip_ecn_decapsulate(struct sk_buff *skb)
 static inline void ipip6_ecn_decapsulate(struct iphdr *iph, struct sk_buff *skb)
 {
         if (INET_ECN_is_ce(iph->tos))
-                IP6_ECN_set_ce(skb->nh.ipv6h);
+                IP6_ECN_set_ce(ipv6_hdr(skb));
 }
 
 /* Add encapsulation header.