diff options
| author | Rob Herring <robh@kernel.org> | 2014-01-17 16:01:27 -0600 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2014-01-17 16:01:27 -0600 |
| commit | 361128fcbf30f590a05c8e8789155364f37367db (patch) | |
| tree | 7f7973599e286dfd48ea724a5b7fb4bca76b294e /crypto/algif_skcipher.c | |
| parent | e2897d7e0b0460dca91b52d55ce41c888363502d (diff) | |
| parent | 482c43419fc204b4b658fa4acb80cd502e5fcbac (diff) | |
| download | blackbird-op-linux-361128fcbf30f590a05c8e8789155364f37367db.tar.gz blackbird-op-linux-361128fcbf30f590a05c8e8789155364f37367db.zip | |
Merge remote-tracking branch 'grant/devicetree/next' into for-3.14
Diffstat (limited to 'crypto/algif_skcipher.c')
| -rw-r--r-- | crypto/algif_skcipher.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/crypto/algif_skcipher.c b/crypto/algif_skcipher.c index 6a6dfc062d2a..a19c027b29bd 100644 --- a/crypto/algif_skcipher.c +++ b/crypto/algif_skcipher.c @@ -378,6 +378,9 @@ static ssize_t skcipher_sendpage(struct socket *sock, struct page *page, struct skcipher_sg_list *sgl; int err = -EINVAL; + if (flags & MSG_SENDPAGE_NOTLAST) + flags |= MSG_MORE; + lock_sock(sk); if (!ctx->more && ctx->used) goto unlock; |
