| From foo@baz Wed Dec 18 12:40:45 PST 2013 |
| Date: Wed, 18 Dec 2013 12:40:45 -0800 |
| To: Greg KH <gregkh@linuxfoundation.org> |
| From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| 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 <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> |
| |
| --- |
| 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 }; |
| |