From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Veaceslav Falico , "David S. Miller" , Eric Dumazet , Richard Weinberger , Shawn Landden , Tom Herbert Subject: [PATCH 3.4 31/31] Revert "net: update consumers of MSG_MORE to recognize MSG_SENDPAGE_NOTLAST" Date: Wed, 18 Dec 2013 13:08:39 -0800 Message-Id: <20131218210523.665045109@linuxfoundation.org> In-Reply-To: <20131218210522.790152625@linuxfoundation.org> References: <20131218210522.790152625@linuxfoundation.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: 3.4-stable review patch. If anyone has any objections, please let me know. ------------------ 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 --- net/ipv4/udp.c | 3 --- 3 files changed, 9 deletions(-) --- a/crypto/algif_hash.c +++ b/crypto/algif_hash.c @@ -117,9 +117,6 @@ static ssize_t hash_sendpage(struct sock 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); --- a/crypto/algif_skcipher.c +++ b/crypto/algif_skcipher.c @@ -381,9 +381,6 @@ static ssize_t skcipher_sendpage(struct 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; --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -1042,9 +1042,6 @@ int udp_sendpage(struct sock *sk, struct if (flags & MSG_SENDPAGE_NOTLAST) flags |= MSG_MORE; - if (flags & MSG_SENDPAGE_NOTLAST) - flags |= MSG_MORE; - if (!up->pending) { struct msghdr msg = { .msg_flags = flags|MSG_MORE };