[NET]: Convert init_timer into setup_timer

[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 4618c18e611dc3bd100809eeaec8910903d950e8..656976760ad47175afa8bc6ac7d2152d5e7f95b4 100644 (file)
--- a/net/ipv6/xfrm6_output.c
+++ b/net/ipv6/xfrm6_output.c
@@ -50,7 +50,7 @@ static inline int xfrm6_output_one(struct sk_buff *skb)
        struct ipv6hdr *iph;
        int err;
 
-       if (x->props.mode == XFRM_MODE_TUNNEL) {
+       if (x->outer_mode->flags & XFRM_MODE_FLAG_TUNNEL) {
                err = xfrm6_tunnel_check_size(skb);
                if (err)
                        goto error_nolock;
@@ -80,7 +80,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,
+               err = nf_hook(PF_INET6, NF_IP6_LOCAL_OUT, skb, NULL,
                              skb->dst->dev, dst_output);
                if (unlikely(err != 1))
                        break;
@@ -88,7 +88,7 @@ static int xfrm6_output_finish2(struct sk_buff *skb)
                if (!skb->dst->xfrm)
                        return dst_output(skb);
 
-               err = nf_hook(PF_INET6, NF_IP6_POST_ROUTING, &skb, NULL,
+               err = nf_hook(PF_INET6, NF_IP6_POST_ROUTING, skb, NULL,
                              skb->dst->dev, xfrm6_output_finish2);
                if (unlikely(err != 1))
                        break;