diff options
author | John Stultz <john.stultz@linaro.org> | 2011-07-08 15:58:56 -0700 |
---|---|---|
committer | John Stultz <john.stultz@linaro.org> | 2011-07-08 15:58:56 -0700 |
commit | a448bfbd8e15bb2ed380a75f20adeb6e8d752abb (patch) | |
tree | 1ab81f3867a5f7e0e9a6cc06fac678d670c2d464 /net/ipv6/udp.c | |
parent | 2aced4d6099ce987233ab2ffad42b90800dadf09 (diff) | |
parent | 0226f8a76da6bc97c9bb4af3fd2f6eeb03c5b0b0 (diff) |
Merge branch 'upstream/android-3.0' into linaro-android-3.0
Diffstat (limited to 'net/ipv6/udp.c')
-rw-r--r-- | net/ipv6/udp.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index 41f8c9c08db..328985c4088 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -453,8 +453,11 @@ csum_copy_err: } unlock_sock_fast(sk, slow); - if (flags & MSG_DONTWAIT) + if (noblock) return -EAGAIN; + + /* starting over for a new packet */ + msg->msg_flags &= ~MSG_TRUNC; goto try_again; } |