diff options
| author | Jakub Kicinski <jakub.kicinski@netronome.com> | 2019-10-03 20:18:56 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-10-04 23:07:07 +0200 |
| commit | 16bed0e6ac07b1a0b3e9c33ec5e892bc7074a627 (patch) | |
| tree | 7713f4d3901543ecf34c04fd94a6f2ca7cbba4c1 /net/tls | |
| parent | net/tls: rename tls_device to tls_toe_device (diff) | |
| download | linux-16bed0e6ac07b1a0b3e9c33ec5e892bc7074a627.tar.xz linux-16bed0e6ac07b1a0b3e9c33ec5e892bc7074a627.zip | |
net/tls: move tls_build_proto() on init path
Move tls_build_proto() so that TOE offload doesn't have to call it
mid way through its bypass enable path.
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>
Diffstat (limited to 'net/tls')
| -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 a1203807a3ef..7bc2ad26316f 100644 --- a/net/tls/tls_main.c +++ b/net/tls/tls_main.c @@ -668,14 +668,11 @@ static int tls_hw_prot(struct sock *sk) if (!ctx) goto out; - spin_unlock_bh(&device_spinlock); - tls_build_proto(sk); ctx->sk_destruct = sk->sk_destruct; sk->sk_destruct = tls_hw_sk_destruct; ctx->rx_conf = TLS_HW_RECORD; ctx->tx_conf = TLS_HW_RECORD; update_sk_prot(sk, ctx); - spin_lock_bh(&device_spinlock); rc = 1; break; } @@ -776,6 +773,8 @@ static int tls_init(struct sock *sk) struct tls_context *ctx; int rc = 0; + tls_build_proto(sk); + if (tls_hw_prot(sk)) return 0; @@ -788,8 +787,6 @@ static int tls_init(struct sock *sk) if (sk->sk_state != TCP_ESTABLISHED) return -ENOTSUPP; - tls_build_proto(sk); - /* allocate tls context */ write_lock_bh(&sk->sk_callback_lock); ctx = create_ctx(sk); |