diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2014-01-02 13:12:14 -0500 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2014-01-02 13:12:14 -0500 |
| commit | 71a51f80d930faf4b54637f10305e295a05389fc (patch) | |
| tree | 6b2a9ba3c09fb34a40d94c703d09e1f37643b15e /net/ipv4 | |
| parent | e88b1c51941d964e77ef7e9099075ae2e8dafd75 (diff) | |
| parent | 095f493c4d532b0ced3aee22e2d5b2cea02aa773 (diff) | |
Merge tag 'v3.10.25' into v3.10-rt
This is the 3.10.25 stable release
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 233f1911dc34..c3075b552248 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 }; |