diff options
author | Ingo Molnar <mingo@kernel.org> | 2018-07-03 09:20:22 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2018-07-03 09:20:22 +0200 |
commit | 4520843dfa34417eb1e2061f60d2345d9ca614e1 (patch) | |
tree | 7b983b8cf20c6154cf897000610c5b7c754e26d9 /net/tls/tls_main.c | |
parent | sched/fair: Remove stale tg_unthrottle_up() comments (diff) | |
parent | kthread, sched/core: Fix kthread_parkme() (again...) (diff) | |
download | linux-dev-4520843dfa34417eb1e2061f60d2345d9ca614e1.tar.xz linux-dev-4520843dfa34417eb1e2061f60d2345d9ca614e1.zip |
Merge branch 'sched/urgent' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/tls/tls_main.c')
-rw-r--r-- | net/tls/tls_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c index a127d61e8af9..301f22430469 100644 --- a/net/tls/tls_main.c +++ b/net/tls/tls_main.c @@ -712,7 +712,7 @@ static int __init tls_register(void) build_protos(tls_prots[TLSV4], &tcp_prot); tls_sw_proto_ops = inet_stream_ops; - tls_sw_proto_ops.poll_mask = tls_sw_poll_mask; + tls_sw_proto_ops.poll = tls_sw_poll; tls_sw_proto_ops.splice_read = tls_sw_splice_read; #ifdef CONFIG_TLS_DEVICE |