summaryrefslogtreecommitdiff
path: root/crypto
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-11-14 17:56:33 +0000
committerMark Brown <broonie@kernel.org>2014-11-14 17:56:33 +0000
commit11a266d2e5e6b73bfba337fb3ef21c8fd4fa4150 (patch)
tree3c4ca0079cb67feeaa6a678212ca6f4313cf5a69 /crypto
parent5bca889af9ee712d0dac3b61b1cec79e7c99ec58 (diff)
parent9c3da88145da7cd96bb898bc0304d3f783d4c8b2 (diff)
Merge tag 'v3.14.24' into linux-linaro-lsk-v3.14
This is the 3.14.24 stable release
Diffstat (limited to 'crypto')
-rw-r--r--crypto/algif_skcipher.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/algif_skcipher.c b/crypto/algif_skcipher.c
index a19c027b29bd..83187f497c7c 100644
--- a/crypto/algif_skcipher.c
+++ b/crypto/algif_skcipher.c
@@ -49,7 +49,7 @@ struct skcipher_ctx {
struct ablkcipher_request req;
};
-#define MAX_SGL_ENTS ((PAGE_SIZE - sizeof(struct skcipher_sg_list)) / \
+#define MAX_SGL_ENTS ((4096 - sizeof(struct skcipher_sg_list)) / \
sizeof(struct scatterlist) - 1)
static inline int skcipher_sndbuf(struct sock *sk)