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 'for-linus2' of git://git.kernel.dk/linux-2.6-block
[pandora-kernel.git]
/
net
/
rds
/
recv.c
diff --git
a/net/rds/recv.c
b/net/rds/recv.c
index
e2a2b93
..
795a00b
100644
(file)
--- a/
net/rds/recv.c
+++ b/
net/rds/recv.c
@@
-432,7
+432,7
@@
int rds_recvmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg,
break;
}
- timeo = wait_event_interruptible_timeout(*sk
->sk_sleep
,
+ timeo = wait_event_interruptible_timeout(*sk
_sleep(sk)
,
(!list_empty(&rs->rs_notify_queue) ||
rs->rs_cong_notify ||
rds_next_incoming(rs, &inc)), timeo);