diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-18 12:40:45 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-20 07:45:12 -0800 |
| commit | 2845c3628961c64e8e3fd6987234a818cfeadb35 (patch) | |
| tree | f6205790c347272abe9e4497db78a79736f47533 /net/ipv4 | |
| parent | 22c3ec552c29cf4bd4a75566088950fe57d860c4 (diff) | |
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>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/udp.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index 233f1911dc3..c3075b55224 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -1073,9 +1073,6 @@ 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 }; |