git: 97d88163d468 - stable/14 - ktls: Remove the socket parameter to ktls_ocf_try()

From: Mark Johnston <markj_at_FreeBSD.org>
Date: Tue, 23 Jul 2024 13:19:32 UTC
The branch stable/14 has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=97d88163d4685b57b3f50e7788691454256c5182

commit 97d88163d4685b57b3f50e7788691454256c5182
Author:     Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2024-07-08 15:52:07 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
CommitDate: 2024-07-23 13:01:30 +0000

    ktls: Remove the socket parameter to ktls_ocf_try()
    
    The socket is unused, and not passing it means that there's less to
    think about when considering how KTLS is synchronized with the rest of
    the socket code.  No functional change intended.
    
    Reviewed by:    gallatin
    MFC after:      2 weeks
    Sponsored by:   Klara, Inc.
    Sponsored by:   Stormshield
    Differential Revision:  https://reviews.freebsd.org/D45675
    
    (cherry picked from commit 5dfca6c375d530908eedb7f103681c2493cf0ca3)
---
 sys/kern/uipc_ktls.c      | 10 +++++-----
 sys/opencrypto/ktls.h     |  2 +-
 sys/opencrypto/ktls_ocf.c |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/sys/kern/uipc_ktls.c b/sys/kern/uipc_ktls.c
index 91dfb8516308..b4b169c4daf2 100644
--- a/sys/kern/uipc_ktls.c
+++ b/sys/kern/uipc_ktls.c
@@ -1076,11 +1076,11 @@ ktls_use_sw(struct ktls_session *tls)
 }
 
 static int
-ktls_try_sw(struct socket *so, struct ktls_session *tls, int direction)
+ktls_try_sw(struct ktls_session *tls, int direction)
 {
 	int error;
 
-	error = ktls_ocf_try(so, tls, direction);
+	error = ktls_ocf_try(tls, direction);
 	if (error)
 		return (error);
 	ktls_use_sw(tls);
@@ -1237,7 +1237,7 @@ ktls_enable_rx(struct socket *so, struct tls_enable *en)
 	if (error)
 		return (error);
 
-	error = ktls_ocf_try(so, tls, KTLS_RX);
+	error = ktls_ocf_try(tls, KTLS_RX);
 	if (error) {
 		ktls_free(tls);
 		return (error);
@@ -1318,7 +1318,7 @@ ktls_enable_tx(struct socket *so, struct tls_enable *en)
 #endif
 		error = ktls_try_ifnet(so, tls, KTLS_TX, false);
 	if (error)
-		error = ktls_try_sw(so, tls, KTLS_TX);
+		error = ktls_try_sw(tls, KTLS_TX);
 
 	if (error) {
 		ktls_free(tls);
@@ -1503,7 +1503,7 @@ ktls_set_tx_mode(struct socket *so, int mode)
 	if (mode == TCP_TLS_MODE_IFNET)
 		error = ktls_try_ifnet(so, tls_new, KTLS_TX, true);
 	else
-		error = ktls_try_sw(so, tls_new, KTLS_TX);
+		error = ktls_try_sw(tls_new, KTLS_TX);
 	if (error) {
 		counter_u64_add(ktls_switch_failed, 1);
 		ktls_free(tls_new);
diff --git a/sys/opencrypto/ktls.h b/sys/opencrypto/ktls.h
index 0fe02b7f50f5..efba25e17013 100644
--- a/sys/opencrypto/ktls.h
+++ b/sys/opencrypto/ktls.h
@@ -48,7 +48,7 @@ struct ktls_ocf_encrypt_state {
 
 void ktls_encrypt_cb(struct ktls_ocf_encrypt_state *state, int error);
 void ktls_ocf_free(struct ktls_session *tls);
-int ktls_ocf_try(struct socket *so, struct ktls_session *tls, int direction);
+int ktls_ocf_try(struct ktls_session *tls, int direction);
 int ktls_ocf_encrypt(struct ktls_ocf_encrypt_state *state,
     struct ktls_session *tls, struct mbuf *m, struct iovec *outiov,
     int outiovcnt);
diff --git a/sys/opencrypto/ktls_ocf.c b/sys/opencrypto/ktls_ocf.c
index 0b9a07a9c83e..f61fb7f73b5d 100644
--- a/sys/opencrypto/ktls_ocf.c
+++ b/sys/opencrypto/ktls_ocf.c
@@ -983,7 +983,7 @@ ktls_ocf_free(struct ktls_session *tls)
 }
 
 int
-ktls_ocf_try(struct socket *so, struct ktls_session *tls, int direction)
+ktls_ocf_try(struct ktls_session *tls, int direction)
 {
 	struct crypto_session_params csp, mac_csp, recrypt_csp;
 	struct ktls_ocf_session *os;