diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-12 01:40:02 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-12 01:40:02 (GMT) |
commit | 42a0ddcd484d0470d4c1b114ffb6be1d35f8ac6b (patch) | |
tree | c1a93de1487a69c2fc0ee165b882bf4c896e0e72 /crypto/blkcipher.c | |
parent | 53e3ccfd153f0e71352b34a930e231ac1ae07d5e (diff) | |
parent | 3acc84739dd5d746840f881ad4d60bd2a428f1dd (diff) | |
download | linux-fsl-qoriq-42a0ddcd484d0470d4c1b114ffb6be1d35f8ac6b.tar.xz |
Merge git://github.com/herbertx/crypto
* git://github.com/herbertx/crypto:
crypto: algapi - Fix build problem with NET disabled
crypto: user - Fix rwsem leak in crypto_user
Diffstat (limited to 'crypto/blkcipher.c')
-rw-r--r-- | crypto/blkcipher.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/crypto/blkcipher.c b/crypto/blkcipher.c index 2572d26..1e61d1a 100644 --- a/crypto/blkcipher.c +++ b/crypto/blkcipher.c @@ -494,6 +494,7 @@ static int crypto_init_blkcipher_ops(struct crypto_tfm *tfm, u32 type, u32 mask) return crypto_init_blkcipher_ops_async(tfm); } +#ifdef CONFIG_NET static int crypto_blkcipher_report(struct sk_buff *skb, struct crypto_alg *alg) { struct crypto_report_blkcipher rblkcipher; @@ -515,6 +516,12 @@ static int crypto_blkcipher_report(struct sk_buff *skb, struct crypto_alg *alg) nla_put_failure: return -EMSGSIZE; } +#else +static int crypto_blkcipher_report(struct sk_buff *skb, struct crypto_alg *alg) +{ + return -ENOSYS; +} +#endif static void crypto_blkcipher_show(struct seq_file *m, struct crypto_alg *alg) __attribute__ ((unused)); |