diff options
Diffstat (limited to 'net/ipv4/tcp.c')
| -rw-r--r-- | net/ipv4/tcp.c | 4 | 
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 42187a3b82f4..d8876f0e9672 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -584,7 +584,7 @@ __poll_t tcp_poll(struct file *file, struct socket *sock, poll_table *wait)  	}  	/* This barrier is coupled with smp_wmb() in tcp_reset() */  	smp_rmb(); -	if (sk->sk_err || !skb_queue_empty(&sk->sk_error_queue)) +	if (sk->sk_err || !skb_queue_empty_lockless(&sk->sk_error_queue))  		mask |= EPOLLERR;  	return mask; @@ -1964,7 +1964,7 @@ int tcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int nonblock,  	if (unlikely(flags & MSG_ERRQUEUE))  		return inet_recv_error(sk, msg, len, addr_len); -	if (sk_can_busy_loop(sk) && skb_queue_empty(&sk->sk_receive_queue) && +	if (sk_can_busy_loop(sk) && skb_queue_empty_lockless(&sk->sk_receive_queue) &&  	    (sk->sk_state == TCP_ESTABLISHED))  		sk_busy_loop(sk, nonblock);  |