2018-12-11 10:20:15

by Atul Gupta

Subject: [tls 1/5] net/tls: Init routines in create_ctx

create_ctx is called from tls_init and tls_hw_prot
hence initialize function pointers in common routine.

Signed-off-by: Atul Gupta <[email protected]>
---
net/tls/tls_main.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c
index 311cec8..4920803 100644
--- a/net/tls/tls_main.c
+++ b/net/tls/tls_main.c
@@ -543,6 +543,9 @@ static struct tls_context *create_ctx(struct sock *sk)
return NULL;

icsk->icsk_ulp_data = ctx;
+ ctx->setsockopt = sk->sk_prot->setsockopt;
+ ctx->getsockopt = sk->sk_prot->getsockopt;
+ ctx->sk_proto_close = sk->sk_prot->close;
return ctx;
}

@@ -675,9 +678,6 @@ static int tls_init(struct sock *sk)
rc = -ENOMEM;
goto out;
}
- ctx->setsockopt = sk->sk_prot->setsockopt;
- ctx->getsockopt = sk->sk_prot->getsockopt;
- ctx->sk_proto_close = sk->sk_prot->close;

/* Build IPv6 TLS whenever the address of tcpv6 _prot changes */
if (ip_ver == TLSV6 &&
--
1.8.3.1

2018-12-14 21:41:04

by David Miller

Subject: Re: [tls 1/5] net/tls: Init routines in create_ctx

From: Atul Gupta <[email protected]>
Date: Tue, 11 Dec 2018 02:19:40 -0800

> create_ctx is called from tls_init and tls_hw_prot
> hence initialize function pointers in common routine.
>
> Signed-off-by: Atul Gupta <[email protected]>

Applied.