diff options
| author | Alice Ryhl <aliceryhl@google.com> | 2025-10-20 11:45:04 +0000 |
|---|---|---|
| committer | Alice Ryhl <aliceryhl@google.com> | 2025-10-20 11:49:19 +0000 |
| commit | 91321980923477044eaf91ca6445a409c4b9712e (patch) | |
| tree | c2d24d9bcad6bec4387115527b645b30a8d3bd0b /net/tls/tls_main.c | |
| parent | 63e919a31625d5d2878cfc2511274826e29336b2 (diff) | |
| parent | 211ddde0823f1442e4ad052a2f30f050145ccada (diff) | |
Merge tag 'v6.18-rc2' into 'drm-rust-next'
When pushing commits to drm-rust-next, we need to verify that the
patches pass rustfmt. Thus, pull in v6.18-rc2 for its rustfmt fix.
Signed-off-by: Alice Ryhl <aliceryhl@google.com>
Diffstat (limited to 'net/tls/tls_main.c')
| -rw-r--r-- | net/tls/tls_main.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c index a3ccb3135e51..39a2ab47fe72 100644 --- a/net/tls/tls_main.c +++ b/net/tls/tls_main.c @@ -255,12 +255,9 @@ int tls_process_cmsg(struct sock *sk, struct msghdr *msg, if (msg->msg_flags & MSG_MORE) return -EINVAL; - rc = tls_handle_open_record(sk, msg->msg_flags); - if (rc) - return rc; - *record_type = *(unsigned char *)CMSG_DATA(cmsg); - rc = 0; + + rc = tls_handle_open_record(sk, msg->msg_flags); break; default: return -EINVAL; |