[IPV6]: Add ip6_local_out

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

diff --git a/net/ipv6/xfrm6_output.c b/net/ipv6/xfrm6_output.c
index c45050cfe72b27128d80d574a459d4ba5de12dd8..0f0ff51f6dbadcb5119f5cd15d16a4ab32ac45c4 100644 (file)
--- a/net/ipv6/xfrm6_output.c
+++ b/net/ipv6/xfrm6_output.c
@@ -75,16 +75,12 @@ EXPORT_SYMBOL(xfrm6_prepare_output);
 
 static inline int xfrm6_output_one(struct sk_buff *skb)
 {
-       struct ipv6hdr *iph;
        int err;
 
        err = xfrm_output(skb);
        if (err)
                goto error_nolock;
 
-       iph = ipv6_hdr(skb);
-       iph->payload_len = htons(skb->len - sizeof(*iph));
-
        IP6CB(skb)->flags |= IP6SKB_XFRM_TRANSFORMED;
        err = 0;
 
@@ -102,8 +98,7 @@ static int xfrm6_output_finish2(struct sk_buff *skb)
        while (likely((err = xfrm6_output_one(skb)) == 0)) {
                nf_reset(skb);
 
-               err = nf_hook(PF_INET6, NF_IP6_LOCAL_OUT, skb, NULL,
-                             skb->dst->dev, dst_output);
+               err = __ip6_local_out(skb);
                if (unlikely(err != 1))
                        break;