summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2016-07-21 12:26:55 +0800
committerHerbert Xu <herbert@gondor.apana.org.au>2016-07-21 12:26:55 +0800
commit51b259bb01fcfb372ae39332936055b18328946c (patch)
treee0be652c70a772e7cc8a6ad6daa6d53e70a25d98 /crypto
parent16dee78005be9908197c707393a3b6a61a14b4fb (diff)
parent81dc0365cfa7bc7c08a0e44d9ee04964df782e19 (diff)
downloadlinux-stable-51b259bb01fcfb372ae39332936055b18328946c.tar.gz
linux-stable-51b259bb01fcfb372ae39332936055b18328946c.tar.bz2
linux-stable-51b259bb01fcfb372ae39332936055b18328946c.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Merge the crypto tree to resolve conflict in qat Makefile.
Diffstat (limited to 'crypto')
-rw-r--r--crypto/crypto_user.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/crypto/crypto_user.c b/crypto/crypto_user.c
index c24a40c8a4bf..1c5705481c69 100644
--- a/crypto/crypto_user.c
+++ b/crypto/crypto_user.c
@@ -440,6 +440,7 @@ static const int crypto_msg_min[CRYPTO_NR_MSGTYPES] = {
[CRYPTO_MSG_NEWALG - CRYPTO_MSG_BASE] = MSGSIZE(crypto_user_alg),
[CRYPTO_MSG_DELALG - CRYPTO_MSG_BASE] = MSGSIZE(crypto_user_alg),
[CRYPTO_MSG_UPDATEALG - CRYPTO_MSG_BASE] = MSGSIZE(crypto_user_alg),
+ [CRYPTO_MSG_GETALG - CRYPTO_MSG_BASE] = MSGSIZE(crypto_user_alg),
[CRYPTO_MSG_DELRNG - CRYPTO_MSG_BASE] = 0,
};