From 88e2b37435b69b04ea454be0a5b38b990b2242fd Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Mon, 28 Jan 2008 19:35:49 -0800
Subject: [PATCH] --- yaml --- r: 81849 b: refs/heads/master c:
 6fbf2cb77461a0cd0675228d20dd0f70d7b2251f h: refs/heads/master i:   81847:
 9cf2f53d14f573cd6c1523a37d5787dea6fa276f v: v3

---
 [refs]                     | 2 +-
 trunk/net/xfrm/xfrm_algo.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index e5fe4c5739ab..a2be2143b665 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 38320c70d282be1997a5204c7c7fe14c3aa6bfaa
+refs/heads/master: 6fbf2cb77461a0cd0675228d20dd0f70d7b2251f
diff --git a/trunk/net/xfrm/xfrm_algo.c b/trunk/net/xfrm/xfrm_algo.c
index b5c5347aed66..02e3ecf9585d 100644
--- a/trunk/net/xfrm/xfrm_algo.c
+++ b/trunk/net/xfrm/xfrm_algo.c
@@ -358,21 +358,21 @@ static const struct xfrm_algo_list xfrm_aalg_list = {
 	.algs = aalg_list,
 	.entries = ARRAY_SIZE(aalg_list),
 	.type = CRYPTO_ALG_TYPE_HASH,
-	.mask = CRYPTO_ALG_TYPE_HASH_MASK | CRYPTO_ALG_ASYNC,
+	.mask = CRYPTO_ALG_TYPE_HASH_MASK,
 };
 
 static const struct xfrm_algo_list xfrm_ealg_list = {
 	.algs = ealg_list,
 	.entries = ARRAY_SIZE(ealg_list),
 	.type = CRYPTO_ALG_TYPE_BLKCIPHER,
-	.mask = CRYPTO_ALG_TYPE_MASK | CRYPTO_ALG_ASYNC,
+	.mask = CRYPTO_ALG_TYPE_BLKCIPHER_MASK,
 };
 
 static const struct xfrm_algo_list xfrm_calg_list = {
 	.algs = calg_list,
 	.entries = ARRAY_SIZE(calg_list),
 	.type = CRYPTO_ALG_TYPE_COMPRESS,
-	.mask = CRYPTO_ALG_TYPE_MASK | CRYPTO_ALG_ASYNC,
+	.mask = CRYPTO_ALG_TYPE_MASK,
 };
 
 static struct xfrm_algo_desc *xfrm_find_algo(