diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2021-06-22 13:56:50 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2021-06-22 13:56:50 -0300 |
| commit | ce09673636f9581d2e2e24af785c463c030a1fd8 (patch) | |
| tree | 5d696220bd70dcad7cc0809cf6e3225b4953bf05 /net/tls/tls_main.c | |
| parent | 45237f9898fce54a8cc6d40f7455291e0e6c4277 (diff) | |
| parent | a96bfed64c8986d6404e553f18203cae1f5ac7e6 (diff) | |
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up fixes, since perf/urgent is already upstream.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'net/tls/tls_main.c')
| -rw-r--r-- | net/tls/tls_main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c index 47b7c5334c34..fde56ff49163 100644 --- a/net/tls/tls_main.c +++ b/net/tls/tls_main.c @@ -636,6 +636,7 @@ struct tls_context *tls_ctx_create(struct sock *sk) mutex_init(&ctx->tx_lock); rcu_assign_pointer(icsk->icsk_ulp_data, ctx); ctx->sk_proto = READ_ONCE(sk->sk_prot); + ctx->sk = sk; return ctx; } |