diff options
| author | Alex Shi <alex.shi@linaro.org> | 2013-12-23 10:54:59 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2013-12-23 10:54:59 +0800 |
| commit | abc5c8153c473f352bbc6eccfb016564a1b58b7e (patch) | |
| tree | 3d5b999e02a8136998d72eb60df923ed81793a69 /net/ipv4 | |
| parent | 188c91c2f4c54d8265ed947886ec1bbcf8f24e99 (diff) | |
| parent | 3c6556b1a9c2f9c91aacbc57bac938691fedda81 (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, 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 }; |