diff options
author | Mark Brown <broonie@kernel.org> | 2023-07-23 23:33:05 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2023-07-23 23:33:05 +0100 |
commit | de1b43a57aff8b1808bbfe0402932f9e373d1172 (patch) | |
tree | 699c828946223aab18a0aab5175e6902a8ce2e42 /net/ipv4/tcp_fastopen.c | |
parent | 8cf2e3b1961e59dabc75e9e917d58439164a8f84 (diff) | |
parent | 6eaae198076080886b9e7d57f4ae06fa782f90ef (diff) |
ASoC: Merge up fixes from mainline
There's several things here that will really help my CI.
Diffstat (limited to 'net/ipv4/tcp_fastopen.c')
-rw-r--r-- | net/ipv4/tcp_fastopen.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/ipv4/tcp_fastopen.c b/net/ipv4/tcp_fastopen.c index 45cc7f1ca296..85e4953f1182 100644 --- a/net/ipv4/tcp_fastopen.c +++ b/net/ipv4/tcp_fastopen.c @@ -296,6 +296,7 @@ static struct sock *tcp_fastopen_create_child(struct sock *sk, static bool tcp_fastopen_queue_check(struct sock *sk) { struct fastopen_queue *fastopenq; + int max_qlen; /* Make sure the listener has enabled fastopen, and we don't * exceed the max # of pending TFO requests allowed before trying @@ -308,10 +309,11 @@ static bool tcp_fastopen_queue_check(struct sock *sk) * temporarily vs a server not supporting Fast Open at all. */ fastopenq = &inet_csk(sk)->icsk_accept_queue.fastopenq; - if (fastopenq->max_qlen == 0) + max_qlen = READ_ONCE(fastopenq->max_qlen); + if (max_qlen == 0) return false; - if (fastopenq->qlen >= fastopenq->max_qlen) { + if (fastopenq->qlen >= max_qlen) { struct request_sock *req1; spin_lock(&fastopenq->lock); req1 = fastopenq->rskq_rst_head; |