From 2845c3628961c64e8e3fd6987234a818cfeadb35 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 18 Dec 2013 12:40:45 -0800 Subject: 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 Cc: David S. Miller Cc: Eric Dumazet Cc: Richard Weinberger Cc: Shawn Landden Cc: Tom Herbert Signed-off-by: Greg Kroah-Hartman --- crypto/algif_hash.c | 3 --- crypto/algif_skcipher.c | 3 --- 2 files changed, 6 deletions(-) (limited to 'crypto') 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 @@ -114,9 +114,6 @@ static ssize_t hash_sendpage(struct socket *sock, struct page *page, struct hash_ctx *ctx = ask->private; int err; - if (flags & MSG_SENDPAGE_NOTLAST) - flags |= MSG_MORE; - if (flags & MSG_SENDPAGE_NOTLAST) flags |= MSG_MORE; 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 @@ -378,9 +378,6 @@ 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; - if (flags & MSG_SENDPAGE_NOTLAST) flags |= MSG_MORE; -- cgit v1.2.3