vserver 2.0 rc7

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

diff --git a/net/ipv6/ah6.c b/net/ipv6/ah6.c
index 32ecedb..e3ecf62 100644 (file)
--- a/net/ipv6/ah6.c
+++ b/net/ipv6/ah6.c
@@ -154,12 +154,10 @@ static int ipv6_clear_mutable_options(struct ipv6hdr *iph, int len)
        return 0;
 }
 
-static int ah6_output(struct sk_buff *skb)
+static int ah6_output(struct xfrm_state *x, struct sk_buff *skb)
 {
        int err;
        int extlen;
-       struct dst_entry *dst = skb->dst;
-       struct xfrm_state *x  = dst->xfrm;
        struct ipv6hdr *top_iph;
        struct ip_auth_hdr *ah;
        struct ah_data *ahp;
@@ -375,7 +373,7 @@ static int ah6_init_state(struct xfrm_state *x, void *args)
         * we need for AH processing.  This lookup cannot fail here
         * after a successful crypto_alloc_tfm().
         */
-       aalg_desc = xfrm_aalg_get_byname(x->aalg->alg_name);
+       aalg_desc = xfrm_aalg_get_byname(x->aalg->alg_name, 0);
        BUG_ON(!aalg_desc);
 
        if (aalg_desc->uinfo.auth.icv_fullbits/8 !=