summaryrefslogtreecommitdiffstats
path: root/net/ipv4/tcp.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/ipv4/tcp.c')
-rw-r--r--net/ipv4/tcp.c4
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)
584 } 584 }
585 /* This barrier is coupled with smp_wmb() in tcp_reset() */ 585 /* This barrier is coupled with smp_wmb() in tcp_reset() */
586 smp_rmb(); 586 smp_rmb();
587 if (sk->sk_err || !skb_queue_empty(&sk->sk_error_queue)) 587 if (sk->sk_err || !skb_queue_empty_lockless(&sk->sk_error_queue))
588 mask |= EPOLLERR; 588 mask |= EPOLLERR;
589 589
590 return mask; 590 return mask;
@@ -1964,7 +1964,7 @@ int tcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int nonblock,
1964 if (unlikely(flags & MSG_ERRQUEUE)) 1964 if (unlikely(flags & MSG_ERRQUEUE))
1965 return inet_recv_error(sk, msg, len, addr_len); 1965 return inet_recv_error(sk, msg, len, addr_len);
1966 1966
1967 if (sk_can_busy_loop(sk) && skb_queue_empty(&sk->sk_receive_queue) && 1967 if (sk_can_busy_loop(sk) && skb_queue_empty_lockless(&sk->sk_receive_queue) &&
1968 (sk->sk_state == TCP_ESTABLISHED)) 1968 (sk->sk_state == TCP_ESTABLISHED))
1969 sk_busy_loop(sk, nonblock); 1969 sk_busy_loop(sk, nonblock);
1970 1970