diff options
| author | David Howells <dhowells@redhat.com> | 2020-09-16 03:38:15 +0300 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2020-11-23 21:09:30 +0300 |
| commit | 8d47a43c48af31c0027e1e08fce7af5f9aaa83c7 (patch) | |
| tree | 7320f2829cae231950048115bb712afe6d1911c3 /net/rxrpc/conn_client.c | |
| parent | 177b8989661bf7f90851c7ab3dc174b1aa117989 (diff) | |
| download | linux-8d47a43c48af31c0027e1e08fce7af5f9aaa83c7.tar.xz | |
rxrpc: Merge prime_packet_security into init_connection_security
Merge the ->prime_packet_security() into the ->init_connection_security()
hook as they're always called together.
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'net/rxrpc/conn_client.c')
| -rw-r--r-- | net/rxrpc/conn_client.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/net/rxrpc/conn_client.c b/net/rxrpc/conn_client.c index 7e574c75be8e..dbea0bfee48e 100644 --- a/net/rxrpc/conn_client.c +++ b/net/rxrpc/conn_client.c @@ -180,10 +180,6 @@ rxrpc_alloc_client_connection(struct rxrpc_bundle *bundle, gfp_t gfp) if (ret < 0) goto error_1; - ret = conn->security->prime_packet_security(conn); - if (ret < 0) - goto error_2; - atomic_inc(&rxnet->nr_conns); write_lock(&rxnet->conn_lock); list_add_tail(&conn->proc_link, &rxnet->conn_proc_list); @@ -203,8 +199,6 @@ rxrpc_alloc_client_connection(struct rxrpc_bundle *bundle, gfp_t gfp) _leave(" = %p", conn); return conn; -error_2: - conn->security->clear(conn); error_1: rxrpc_put_client_connection_id(conn); error_0: |