projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux...
[deliverable/linux.git]
/
net
/
rxrpc
/
ar-recvmsg.c
diff --git
a/net/rxrpc/ar-recvmsg.c
b/net/rxrpc/ar-recvmsg.c
index 4575485ad1b4d02796717879e09ad9078e232617..19a560626dc4f4232592e7d34381a859a04b6f4c 100644
(file)
--- a/
net/rxrpc/ar-recvmsg.c
+++ b/
net/rxrpc/ar-recvmsg.c
@@
-87,7
+87,7
@@
int rxrpc_recvmsg(struct kiocb *iocb, struct socket *sock,
if (!skb) {
/* nothing remains on the queue */
if (copied &&
- (
msg->msg_
flags & MSG_PEEK || timeo == 0))
+ (flags & MSG_PEEK || timeo == 0))
goto out;
/* wait for a message to turn up */
This page took
0.025857 seconds
and
5
git commands to generate.