diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2026-06-16 08:55:47 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2026-06-16 08:55:48 -0700 |
| commit | ffaf8967735e7271a4a1362840bcfbbf2a7a722b (patch) | |
| tree | 592952659c27f5c1d22cc664a7c7599a3dc47bd4 /include/linux | |
| parent | e1f544466b2c6c67e70e42118a7fb39cee0b374a (diff) | |
| parent | 5949a7cf11e685dd171e33586c272dfe673310b6 (diff) | |
Merge branch 'tls-reject-the-combination-of-tls-and-sockmap'
Jakub Kicinski says:
====================
tls: reject the combination of TLS and sockmap
There are no known TLS+sockmap users and it has some known
hard to solve bugs. Let's reject this configuration as we
discussed a number of times.
====================
Link: https://patch.msgid.link/20260614014102.461064-1-kuba@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/skmsg.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/include/linux/skmsg.h b/include/linux/skmsg.h index 19f4f253b4f9..ca0ec9c8608e 100644 --- a/include/linux/skmsg.h +++ b/include/linux/skmsg.h @@ -544,15 +544,6 @@ static inline void psock_progs_drop(struct sk_psock_progs *progs) psock_set_prog(&progs->skb_verdict, NULL); } -int sk_psock_tls_strp_read(struct sk_psock *psock, struct sk_buff *skb); - -static inline bool sk_psock_strp_enabled(struct sk_psock *psock) -{ - if (!psock) - return false; - return !!psock->saved_data_ready; -} - /* for tcp only, sk is locked */ static inline ssize_t sk_psock_msg_inq(struct sock *sk) { |