diff options
| author | Mark Brown <broonie@linaro.org> | 2013-12-12 10:22:32 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-12-12 10:22:32 +0000 |
| commit | 78157f5f8cde58d3c552ad6f0ad65118a92e3529 (patch) | |
| tree | 02476bdee08159c29579a99252f7b85a2275e60c /net/ipv4 | |
| parent | c4a3c95bcca5d9997e73c581b8cf6fb9adf8434c (diff) | |
| parent | 16c29dd8dd14a722836ca31440486feb2d730e29 (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/udp.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index c3075b552248..233f1911dc34 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 }; |