diff options
| author | Dave Airlie <airlied@redhat.com> | 2023-10-23 18:20:06 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2023-10-23 18:20:06 +1000 |
| commit | 7cd62eab9babd1fed9c497141650b31168f4f430 (patch) | |
| tree | 85ef2122ca0d88b2b598f45eb071fcd1f4faa3d2 /net/tls/tls_main.c | |
| parent | 035fdc38c1f6ddce3544d8a489548e6cc4de508a (diff) | |
| parent | 05d3ef8bba77c1b5f98d941d8b2d4aeab8118ef1 (diff) | |
| download | lwn-7cd62eab9babd1fed9c497141650b31168f4f430.tar.gz lwn-7cd62eab9babd1fed9c497141650b31168f4f430.zip | |
BackMerge tag 'v6.6-rc7' into drm-next
This is needed to add the msm pr which is based on a higher base.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'net/tls/tls_main.c')
| -rw-r--r-- | net/tls/tls_main.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c index 02f583ff9239..002483e60c19 100644 --- a/net/tls/tls_main.c +++ b/net/tls/tls_main.c @@ -139,8 +139,8 @@ void update_sk_prot(struct sock *sk, struct tls_context *ctx) int wait_on_pending_writer(struct sock *sk, long *timeo) { - int rc = 0; DEFINE_WAIT_FUNC(wait, woken_wake_function); + int ret, rc = 0; add_wait_queue(sk_sleep(sk), &wait); while (1) { @@ -154,9 +154,13 @@ int wait_on_pending_writer(struct sock *sk, long *timeo) break; } - if (sk_wait_event(sk, timeo, - !READ_ONCE(sk->sk_write_pending), &wait)) + ret = sk_wait_event(sk, timeo, + !READ_ONCE(sk->sk_write_pending), &wait); + if (ret) { + if (ret < 0) + rc = ret; break; + } } remove_wait_queue(sk_sleep(sk), &wait); return rc; |