summaryrefslogtreecommitdiff
path: root/crypto/aead.c
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2011-11-03 23:46:07 +1100
committerHerbert Xu <herbert@gondor.apana.org.au>2011-11-11 06:57:06 +0800
commit3acc84739dd5d746840f881ad4d60bd2a428f1dd (patch)
treea93db24c1b59dc077dcd1b69407e5bc7e71d11b0 /crypto/aead.c
parentfb223c32b4d3ee593c8dce07e983680d06abe387 (diff)
downloadlinux-3.10-3acc84739dd5d746840f881ad4d60bd2a428f1dd.tar.gz
linux-3.10-3acc84739dd5d746840f881ad4d60bd2a428f1dd.tar.bz2
linux-3.10-3acc84739dd5d746840f881ad4d60bd2a428f1dd.zip
crypto: algapi - Fix build problem with NET disabled
The report functions use NLA_PUT so we need to ensure that NET is enabled. Reported-by: Luis Henriques <henrix@camandro.org> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto/aead.c')
-rw-r--r--crypto/aead.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/crypto/aead.c b/crypto/aead.c
index 701556ffaae..04add3dca6f 100644
--- a/crypto/aead.c
+++ b/crypto/aead.c
@@ -111,6 +111,7 @@ static int crypto_init_aead_ops(struct crypto_tfm *tfm, u32 type, u32 mask)
return 0;
}
+#ifdef CONFIG_NET
static int crypto_aead_report(struct sk_buff *skb, struct crypto_alg *alg)
{
struct crypto_report_aead raead;
@@ -132,6 +133,12 @@ static int crypto_aead_report(struct sk_buff *skb, struct crypto_alg *alg)
nla_put_failure:
return -EMSGSIZE;
}
+#else
+static int crypto_aead_report(struct sk_buff *skb, struct crypto_alg *alg)
+{
+ return -ENOSYS;
+}
+#endif
static void crypto_aead_show(struct seq_file *m, struct crypto_alg *alg)
__attribute__ ((unused));
@@ -190,6 +197,7 @@ static int crypto_init_nivaead_ops(struct crypto_tfm *tfm, u32 type, u32 mask)
return 0;
}
+#ifdef CONFIG_NET
static int crypto_nivaead_report(struct sk_buff *skb, struct crypto_alg *alg)
{
struct crypto_report_aead raead;
@@ -210,6 +218,12 @@ static int crypto_nivaead_report(struct sk_buff *skb, struct crypto_alg *alg)
nla_put_failure:
return -EMSGSIZE;
}
+#else
+static int crypto_nivaead_report(struct sk_buff *skb, struct crypto_alg *alg)
+{
+ return -ENOSYS;
+}
+#endif
static void crypto_nivaead_show(struct seq_file *m, struct crypto_alg *alg)