net/tls: rename tls_hw_* functions tls_toe_*

The tls_hw_* functions are quite confusingly named, since they
are related to the TOE-offload, not TLS_HW offload which doesn't
require TOE. Rename them.

Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: John Hurley <john.hurley@netronome.com>
Reviewed-by: Simon Horman <simon.horman@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/tls_toe.h b/include/net/tls_toe.h
index 3bb39c795aed5104916e5f7499ad827a3143e031..b3aa7593ce2c373e38a42e8a1f7a975ba0a8c73a 100644 (file)
--- a/include/net/tls_toe.h
+++ b/include/net/tls_toe.h
@@ -69,9 +69,9 @@ struct tls_toe_device {
        struct kref kref;
 };
 
-int tls_hw_prot(struct sock *sk);
-int tls_hw_hash(struct sock *sk);
-void tls_hw_unhash(struct sock *sk);
+int tls_toe_bypass(struct sock *sk);
+int tls_toe_hash(struct sock *sk);
+void tls_toe_unhash(struct sock *sk);
 
 void tls_toe_register_device(struct tls_toe_device *device);
 void tls_toe_unregister_device(struct tls_toe_device *device);

diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c
index 9d0cf14b2f7e4c9f02b43001cd3f4e81078e7ef3..483dda6c3155c6b2044ce81d879df396a3ce64ff 100644 (file)
--- a/net/tls/tls_main.c
+++ b/net/tls/tls_main.c
@@ -681,8 +681,8 @@ static void build_protos(struct proto prot[TLS_NUM_CONFIG][TLS_NUM_CONFIG],
 #endif
 
        prot[TLS_HW_RECORD][TLS_HW_RECORD] = *base;
-       prot[TLS_HW_RECORD][TLS_HW_RECORD].hash         = tls_hw_hash;
-       prot[TLS_HW_RECORD][TLS_HW_RECORD].unhash       = tls_hw_unhash;
+       prot[TLS_HW_RECORD][TLS_HW_RECORD].hash         = tls_toe_hash;
+       prot[TLS_HW_RECORD][TLS_HW_RECORD].unhash       = tls_toe_unhash;
 }
 
 static int tls_init(struct sock *sk)
@@ -692,7 +692,7 @@ static int tls_init(struct sock *sk)
 
        tls_build_proto(sk);
 
-       if (tls_hw_prot(sk))
+       if (tls_toe_bypass(sk))
                return 0;
 
        /* The TLS ulp is currently supported only for TCP sockets

diff --git a/net/tls/tls_toe.c b/net/tls/tls_toe.c
index 89a7014a05f70926abfbdf03716d4cfad83fb2f4..7e1330f19165d030186fb162aabd4229ea70ba66 100644 (file)
--- a/net/tls/tls_toe.c
+++ b/net/tls/tls_toe.c
@@ -41,7 +41,7 @@
 static LIST_HEAD(device_list);
 static DEFINE_SPINLOCK(device_spinlock);
 
-static void tls_hw_sk_destruct(struct sock *sk)
+static void tls_toe_sk_destruct(struct sock *sk)
 {
        struct inet_connection_sock *icsk = inet_csk(sk);
        struct tls_context *ctx = tls_get_ctx(sk);
@@ -52,7 +52,7 @@ static void tls_hw_sk_destruct(struct sock *sk)
        tls_ctx_free(sk, ctx);
 }
 
-int tls_hw_prot(struct sock *sk)
+int tls_toe_bypass(struct sock *sk)
 {
        struct tls_toe_device *dev;
        struct tls_context *ctx;
@@ -66,7 +66,7 @@ int tls_hw_prot(struct sock *sk)
                                goto out;
 
                        ctx->sk_destruct = sk->sk_destruct;
-                       sk->sk_destruct = tls_hw_sk_destruct;
+                       sk->sk_destruct = tls_toe_sk_destruct;
                        ctx->rx_conf = TLS_HW_RECORD;
                        ctx->tx_conf = TLS_HW_RECORD;
                        update_sk_prot(sk, ctx);
@@ -79,7 +79,7 @@ int tls_hw_prot(struct sock *sk)
        return rc;
 }
 
-void tls_hw_unhash(struct sock *sk)
+void tls_toe_unhash(struct sock *sk)
 {
        struct tls_context *ctx = tls_get_ctx(sk);
        struct tls_toe_device *dev;
@@ -98,7 +98,7 @@ void tls_hw_unhash(struct sock *sk)
        ctx->sk_proto->unhash(sk);
 }
 
-int tls_hw_hash(struct sock *sk)
+int tls_toe_hash(struct sock *sk)
 {
        struct tls_context *ctx = tls_get_ctx(sk);
        struct tls_toe_device *dev;
@@ -118,7 +118,7 @@ int tls_hw_hash(struct sock *sk)
        spin_unlock_bh(&device_spinlock);
 
        if (err)
-               tls_hw_unhash(sk);
+               tls_toe_unhash(sk);
        return err;
 }