diff options
author | David Howells <dhowells@redhat.com> | 2020-09-16 01:38:15 +0100 |
---|---|---|
committer | David Howells <dhowells@redhat.com> | 2020-11-23 18:09:30 +0000 |
commit | 8d47a43c48af31c0027e1e08fce7af5f9aaa83c7 (patch) | |
tree | 7320f2829cae231950048115bb712afe6d1911c3 /net/rxrpc/conn_event.c | |
parent | 177b8989661bf7f90851c7ab3dc174b1aa117989 (diff) | |
download | linux-8d47a43c48af31c0027e1e08fce7af5f9aaa83c7.tar.gz linux-8d47a43c48af31c0027e1e08fce7af5f9aaa83c7.tar.bz2 linux-8d47a43c48af31c0027e1e08fce7af5f9aaa83c7.zip |
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_event.c')
-rw-r--r-- | net/rxrpc/conn_event.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/net/rxrpc/conn_event.c b/net/rxrpc/conn_event.c index 03a482ba770f..aab069701398 100644 --- a/net/rxrpc/conn_event.c +++ b/net/rxrpc/conn_event.c @@ -338,10 +338,6 @@ static int rxrpc_process_event(struct rxrpc_connection *conn, if (ret < 0) return ret; - ret = conn->security->prime_packet_security(conn); - if (ret < 0) - return ret; - spin_lock(&conn->bundle->channel_lock); spin_lock_bh(&conn->state_lock); |