[IPSEC]: Store IPv6 nh pointer in mac_header on output

[linux-2.6-omap-h63xx.git] / net / ipv6 / xfrm6_mode_tunnel.c

diff --git a/net/ipv6/xfrm6_mode_tunnel.c b/net/ipv6/xfrm6_mode_tunnel.c
index 5bb0677d373068199562beb6737cfa47268256a1..3dd40af75e81718ed6d2d379fefa59bcc8f1b374 100644 (file)
--- a/net/ipv6/xfrm6_mode_tunnel.c
+++ b/net/ipv6/xfrm6_mode_tunnel.c
@@ -18,8 +18,8 @@
 
 static inline void ipip6_ecn_decapsulate(struct sk_buff *skb)
 {
-       struct ipv6hdr *outer_iph = skb->nh.ipv6h;
-       struct ipv6hdr *inner_iph = skb->h.ipv6h;
+       struct ipv6hdr *outer_iph = ipv6_hdr(skb);
+       struct ipv6hdr *inner_iph = ipipv6_hdr(skb);
 
        if (INET_ECN_is_ce(ipv6_get_dsfield(outer_iph)))
                IP6_ECN_set_ce(inner_iph);
@@ -27,8 +27,8 @@ static inline void ipip6_ecn_decapsulate(struct sk_buff *skb)
 
 static inline void ip6ip_ecn_decapsulate(struct sk_buff *skb)
 {
-       if (INET_ECN_is_ce(ipv6_get_dsfield(skb->nh.ipv6h)))
-                       IP_ECN_set_ce(skb->h.ipiph);
+       if (INET_ECN_is_ce(ipv6_get_dsfield(ipv6_hdr(skb))))
+                       IP_ECN_set_ce(ipip_hdr(skb));
 }
 
 /* Add encapsulation header.
@@ -38,10 +38,11 @@ static inline void ip6ip_ecn_decapsulate(struct sk_buff *skb)
  *     payload_len
  *
  * On exit, skb->h will be set to the start of the encapsulation header to be
- * filled in by x->type->output and skb->nh will be set to the nextheader field
- * of the extension header directly preceding the encapsulation header, or in
- * its absence, that of the top IP header.  The value of skb->data will always
- * point to the top IP header.
+ * filled in by x->type->output and the mac header will be set to the
+ * nextheader field of the extension header directly preceding the
+ * encapsulation header, or in its absence, that of the top IP header.
+ * The value of skb->data and the network header will always point to the
+ * top IP header.
  */
 static int xfrm6_tunnel_output(struct xfrm_state *x, struct sk_buff *skb)
 {
@@ -51,12 +52,12 @@ static int xfrm6_tunnel_output(struct xfrm_state *x, struct sk_buff *skb)
        int dsfield;
 
        skb_push(skb, x->props.header_len);
-       iph = skb->nh.ipv6h;
+       iph = ipv6_hdr(skb);
 
-       skb->nh.raw = skb->data;
-       top_iph = skb->nh.ipv6h;
-       skb->nh.raw = &top_iph->nexthdr;
-       skb->h.ipv6h = top_iph + 1;
+       skb_set_mac_header(skb, offsetof(struct ipv6hdr, nexthdr));
+       skb_reset_network_header(skb);
+       skb_set_transport_header(skb, sizeof(struct ipv6hdr));
+       top_iph = ipv6_hdr(skb);
 
        top_iph->version = 6;
        if (xdst->route->ops->family == AF_INET6) {
@@ -80,6 +81,7 @@ static int xfrm6_tunnel_output(struct xfrm_state *x, struct sk_buff *skb)
        top_iph->hop_limit = dst_metric(dst->child, RTAX_HOPLIMIT);
        ipv6_addr_copy(&top_iph->saddr, (struct in6_addr *)&x->props.saddr);
        ipv6_addr_copy(&top_iph->daddr, (struct in6_addr *)&x->id.daddr);
+       skb->protocol = htons(ETH_P_IPV6);
        return 0;
 }
 
@@ -87,9 +89,10 @@ static int xfrm6_tunnel_input(struct xfrm_state *x, struct sk_buff *skb)
 {
        int err = -EINVAL;
        const unsigned char *old_mac;
+       const unsigned char *nh = skb_network_header(skb);
 
-       if (skb->nh.raw[IP6CB(skb)->nhoff] != IPPROTO_IPV6
-           && skb->nh.raw[IP6CB(skb)->nhoff] != IPPROTO_IPIP)
+       if (nh[IP6CB(skb)->nhoff] != IPPROTO_IPV6 &&
+           nh[IP6CB(skb)->nhoff] != IPPROTO_IPIP)
                goto out;
        if (!pskb_may_pull(skb, sizeof(struct ipv6hdr)))
                goto out;
@@ -98,9 +101,10 @@ static int xfrm6_tunnel_input(struct xfrm_state *x, struct sk_buff *skb)
            (err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC)))
                goto out;
 
-       if (skb->nh.raw[IP6CB(skb)->nhoff] == IPPROTO_IPV6) {
+       nh = skb_network_header(skb);
+       if (nh[IP6CB(skb)->nhoff] == IPPROTO_IPV6) {
                if (x->props.flags & XFRM_STATE_DECAP_DSCP)
-                       ipv6_copy_dscp(skb->nh.ipv6h, skb->h.ipv6h);
+                       ipv6_copy_dscp(ipv6_hdr(skb), ipipv6_hdr(skb));
                if (!(x->props.flags & XFRM_STATE_NOECN))
                        ipip6_ecn_decapsulate(skb);
        } else {
@@ -111,7 +115,7 @@ static int xfrm6_tunnel_input(struct xfrm_state *x, struct sk_buff *skb)
        old_mac = skb_mac_header(skb);
        skb_set_mac_header(skb, -skb->mac_len);
        memmove(skb_mac_header(skb), old_mac, skb->mac_len);
-       skb->nh.raw = skb->data;
+       skb_reset_network_header(skb);
        err = 0;
 
 out: