Merge commit 'jwb/next' into merge

[mv-sheeva.git] / net / key / af_key.c

diff --git a/net/key/af_key.c b/net/key/af_key.c
index 84209fbbeb1756317e05dbf4ba03cdab6379e2a6..76fa6fef64739c3fb881dafc92947a5e5c1c054c 100644 (file)
--- a/net/key/af_key.c
+++ b/net/key/af_key.c
@@ -1193,6 +1193,7 @@ static struct xfrm_state * pfkey_msg2xfrm_state(struct net *net,
                        x->aalg->alg_key_len = key->sadb_key_bits;
                        memcpy(x->aalg->alg_key, key+1, keysize);
                }
+               x->aalg->alg_trunc_len = a->uinfo.auth.icv_truncbits;
                x->props.aalgo = sa->sadb_sa_auth;
                /* x->algo.flags = sa->sadb_sa_flags; */
        }