diff options
| author | David S. Miller <davem@davemloft.net> | 2014-03-15 06:31:55 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-03-15 06:31:55 +0400 |
| commit | 85dcce7a73f1cc59f7a96fe52713b1630f4ca272 (patch) | |
| tree | 6c645923eb2f0152073b90685ce80e46cfb7afed /net/tipc/socket.c | |
| parent | 4c4e4113db249c828fffb286bc95ffb255e081f5 (diff) | |
| parent | a4ecdf82f8ea49f7d3a072121dcbd0bf3a7cb93a (diff) | |
| download | linux-85dcce7a73f1cc59f7a96fe52713b1630f4ca272.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/usb/r8152.c
drivers/net/xen-netback/netback.c
Both the r8152 and netback conflicts were simple overlapping
changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/socket.c')
| -rw-r--r-- | net/tipc/socket.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/tipc/socket.c b/net/tipc/socket.c index 2a89bdb331b5..29b7f26a12cf 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c @@ -992,7 +992,7 @@ static int tipc_wait_for_rcvmsg(struct socket *sock, long timeo) for (;;) { prepare_to_wait(sk_sleep(sk), &wait, TASK_INTERRUPTIBLE); - if (skb_queue_empty(&sk->sk_receive_queue)) { + if (timeo && skb_queue_empty(&sk->sk_receive_queue)) { if (sock->state == SS_DISCONNECTING) { err = -ENOTCONN; break; @@ -1609,7 +1609,7 @@ static int tipc_wait_for_accept(struct socket *sock, long timeo) for (;;) { prepare_to_wait_exclusive(sk_sleep(sk), &wait, TASK_INTERRUPTIBLE); - if (skb_queue_empty(&sk->sk_receive_queue)) { + if (timeo && skb_queue_empty(&sk->sk_receive_queue)) { release_sock(sk); timeo = schedule_timeout(timeo); lock_sock(sk); |