git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next' into for-linus-3.0
[pandora-kernel.git]
/
net
/
ipv6
/
udp.c
diff --git
a/net/ipv6/udp.c
b/net/ipv6/udp.c
index
41f8c9c
..
328985c
100644
(file)
--- 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;
}