aboutsummaryrefslogtreecommitdiff
path: root/crypto
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-11-14 17:56:04 +0000
committerMark Brown <broonie@kernel.org>2014-11-14 17:56:04 +0000
commit8eb52971d4749c0192358e1942ca83d8dc7e686b (patch)
tree418db997d718e14be2d5d9436d50985a4616156d /crypto
parentd91fd220833b8a6250ff6abf86c7e66a75655ee7 (diff)
parentbe70188832b22a8f1a49d0e3a3eb2209f9cfdc8a (diff)
Merge tag 'v3.10.60' into linux-linaro-lsk
This is the 3.10.60 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)