From: Greg Kroah-Hartman Date: Wed, 18 Dec 2013 20:40:45 +0000 (-0800) Subject: Revert "net: update consumers of MSG_MORE to recognize MSG_SENDPAGE_NOTLAST" X-Git-Tag: firefly_0821_release~3679^2~3261 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2845c3628961c64e8e3fd6987234a818cfeadb35;p=firefly-linux-kernel-4.4.55.git 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 --- diff --git a/crypto/algif_hash.c b/crypto/algif_hash.c index 585c3b279feb..850246206b12 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 918a3b4148b8..a19c027b29bd 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; diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index 233f1911dc34..c3075b552248 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -1070,9 +1070,6 @@ int udp_sendpage(struct sock *sk, struct page *page, int offset, struct udp_sock *up = udp_sk(sk); int ret; - if (flags & MSG_SENDPAGE_NOTLAST) - flags |= MSG_MORE; - if (flags & MSG_SENDPAGE_NOTLAST) flags |= MSG_MORE;