aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorShawn Landden <shawn@churchofgit.com>2013-11-24 22:36:28 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-12-11 22:36:27 -0800
commiteb050d976ccdff8c5499a826c19a818868824393 (patch)
treefe3e1d8d204132075c7897a4f59b90a488e90dff /net
parente98bb6cbd858b4b5efc123d59d6e2b4399a70f17 (diff)
downloadlinaro-lsk-eb050d976ccdff8c5499a826c19a818868824393.tar.gz
net: update consumers of MSG_MORE to recognize MSG_SENDPAGE_NOTLAST
commit d3f7d56a7a4671d395e8af87071068a195257bf6 upstream. Commit 35f9c09fe (tcp: tcp_sendpages() should call tcp_push() once) added an internal flag MSG_SENDPAGE_NOTLAST, similar to MSG_MORE. algif_hash, algif_skcipher, and udp used MSG_MORE from tcp_sendpages() and need to see the new flag as identical to MSG_MORE. This fixes sendfile() on AF_ALG. v3: also fix udp Cc: Tom Herbert <therbert@google.com> Cc: Eric Dumazet <eric.dumazet@gmail.com> Cc: David S. Miller <davem@davemloft.net> Reported-and-tested-by: Shawn Landden <shawnlandden@gmail.com> Original-patch: Richard Weinberger <richard@nod.at> Signed-off-by: Shawn Landden <shawn@churchofgit.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/udp.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index c3075b55224..233f1911dc3 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -1073,6 +1073,9 @@ int udp_sendpage(struct sock *sk, struct page *page, int offset,
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 };