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 'fix/misc' into for-linus
[pandora-kernel.git]
/
net
/
dccp
/
output.c
diff --git
a/net/dccp/output.c
b/net/dccp/output.c
index
c0e88c1
..
c96119f
100644
(file)
--- a/
net/dccp/output.c
+++ b/
net/dccp/output.c
@@
-196,7
+196,7
@@
void dccp_write_space(struct sock *sk)
{
read_lock(&sk->sk_callback_lock);
- if (sk
->sk_sleep && waitqueue_active(sk->sk_sleep
))
+ if (sk
_has_sleeper(sk
))
wake_up_interruptible(sk->sk_sleep);
/* Should agree with poll, otherwise some programs break */
if (sock_writeable(sk))