diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-18 12:40:45 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-20 07:45:12 -0800 |
| commit | 2845c3628961c64e8e3fd6987234a818cfeadb35 (patch) | |
| tree | f6205790c347272abe9e4497db78a79736f47533 /crypto | |
| parent | 22c3ec552c29cf4bd4a75566088950fe57d860c4 (diff) | |
Revert "net: update consumers of MSG_MORE to recognize MSG_SENDPAGE_NOTLAST"
It turns out that commit: d3f7d56a7a4671d395e8af87071068a195257bf6 was
applied to the tree twice, which didn't hurt anything, but it's good to
fix this up.
Reported-by: Veaceslav Falico <veaceslav@falico.eu>
Cc: David S. Miller <davem@davemloft.net>
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: Shawn Landden <shawnlandden@gmail.com>
Cc: Tom Herbert <therbert@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/algif_hash.c | 3 | ||||
| -rw-r--r-- | crypto/algif_skcipher.c | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/crypto/algif_hash.c b/crypto/algif_hash.c index 585c3b279fe..850246206b1 100644 --- a/crypto/algif_hash.c +++ b/crypto/algif_hash.c @@ -117,9 +117,6 @@ static ssize_t hash_sendpage(struct socket *sock, struct page *page, if (flags & MSG_SENDPAGE_NOTLAST) flags |= MSG_MORE; - if (flags & MSG_SENDPAGE_NOTLAST) - flags |= MSG_MORE; - lock_sock(sk); sg_init_table(ctx->sgl.sg, 1); sg_set_page(ctx->sgl.sg, page, size, offset); diff --git a/crypto/algif_skcipher.c b/crypto/algif_skcipher.c index 918a3b4148b..a19c027b29b 100644 --- a/crypto/algif_skcipher.c +++ b/crypto/algif_skcipher.c @@ -381,9 +381,6 @@ static ssize_t skcipher_sendpage(struct socket *sock, struct page *page, if (flags & MSG_SENDPAGE_NOTLAST) flags |= MSG_MORE; - if (flags & MSG_SENDPAGE_NOTLAST) - flags |= MSG_MORE; - lock_sock(sk); if (!ctx->more && ctx->used) goto unlock; |