Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec

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

diff --git a/net/ipv6/xfrm6_output.c b/net/ipv6/xfrm6_output.c
index ba624331451c5cf2fababb86a424a4ddef5bfd27..b930d080c66f231f338c7ea860c8c1d798d91fea 100644 (file)
--- a/net/ipv6/xfrm6_output.c
+++ b/net/ipv6/xfrm6_output.c
@@ -166,7 +166,7 @@ static int __xfrm6_output(struct sk_buff *skb)
        return x->outer_mode->afinfo->output_finish(skb);
 }
 
-int xfrm6_output(struct sk_buff *skb)
+int xfrm6_output(struct sock *sk, struct sk_buff *skb)
 {
        return NF_HOOK_COND(NFPROTO_IPV6, NF_INET_POST_ROUTING, skb,
                            NULL, skb_dst(skb)->dev, __xfrm6_output,