vserver 1.9.3

[linux-2.6.git] / net / ipv6 / xfrm6_output.c

diff --git a/net/ipv6/xfrm6_output.c b/net/ipv6/xfrm6_output.c
index 712856f..40612ec 100644 (file)
--- a/net/ipv6/xfrm6_output.c
+++ b/net/ipv6/xfrm6_output.c
@@ -12,6 +12,7 @@
 #include <linux/skbuff.h>
 #include <linux/spinlock.h>
 #include <linux/icmpv6.h>
+#include <net/dsfield.h>
 #include <net/inet_ecn.h>
 #include <net/ipv6.h>
 #include <net/xfrm.h>
@@ -36,6 +37,7 @@ static void xfrm6_encap(struct sk_buff *skb)
        struct dst_entry *dst = skb->dst;
        struct xfrm_state *x = dst->xfrm;
        struct ipv6hdr *iph, *top_iph;
+       int dsfield;
 
        skb_push(skb, x->props.header_len);
        iph = skb->nh.ipv6h;
@@ -58,13 +60,16 @@ static void xfrm6_encap(struct sk_buff *skb)
 
        top_iph->version = 6;
        top_iph->priority = iph->priority;
-       if (x->props.flags & XFRM_STATE_NOECN)
-               IP6_ECN_clear(top_iph);
        top_iph->flow_lbl[0] = iph->flow_lbl[0];
        top_iph->flow_lbl[1] = iph->flow_lbl[1];
        top_iph->flow_lbl[2] = iph->flow_lbl[2];
+       dsfield = ipv6_get_dsfield(top_iph);
+       dsfield = INET_ECN_encapsulate(dsfield, dsfield);
+       if (x->props.flags & XFRM_STATE_NOECN)
+               dsfield &= ~INET_ECN_MASK;
+       ipv6_change_dsfield(top_iph, 0, dsfield);
        top_iph->nexthdr = IPPROTO_IPV6; 
-       top_iph->hop_limit = iph->hop_limit;
+       top_iph->hop_limit = dst_path_metric(dst, 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);
 }
@@ -113,8 +118,7 @@ int xfrm6_output(struct sk_buff **pskb)
 
        xfrm6_encap(skb);
 
-       err = x->type->output(pskb);
-       skb = *pskb;
+       err = x->type->output(skb);
        if (err)
                goto error;