Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 224115
b: refs/heads/master
c: 67426b7
h: refs/heads/master
i:
  224113: 9b35644
  224111: 69dd183
v: v3
  • Loading branch information
Eric Dumazet authored and David S. Miller committed Nov 8, 2010
1 parent ec14dc8 commit 9a8bb64
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: fc766e4c4965915ab52a1d1fa3c7a7b3e7bc07f0
refs/heads/master: 67426b756c4d52c511c4b22b269accea171692a8
6 changes: 4 additions & 2 deletions trunk/net/unix/af_unix.c
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,8 @@ static void unix_write_space(struct sock *sk)
if (unix_writable(sk)) {
wq = rcu_dereference(sk->sk_wq);
if (wq_has_sleeper(wq))
wake_up_interruptible_sync(&wq->wait);
wake_up_interruptible_sync_poll(&wq->wait,
POLLOUT | POLLWRNORM | POLLWRBAND);
sk_wake_async(sk, SOCK_WAKE_SPACE, POLL_OUT);
}
rcu_read_unlock();
Expand Down Expand Up @@ -1710,7 +1711,8 @@ static int unix_dgram_recvmsg(struct kiocb *iocb, struct socket *sock,
goto out_unlock;
}

wake_up_interruptible_sync(&u->peer_wait);
wake_up_interruptible_sync_poll(&u->peer_wait,
POLLOUT | POLLWRNORM | POLLWRBAND);

if (msg->msg_name)
unix_copy_addr(msg, skb->sk);
Expand Down

0 comments on commit 9a8bb64

Please sign in to comment.