summaryrefslogtreecommitdiff
path: root/net/rxrpc/security.c
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2022-10-19 13:49:02 +0100
committerDavid Howells <dhowells@redhat.com>2022-12-01 13:36:38 +0000
commit2cc800863c49a1f4be1b10b756c09a878d3a3f00 (patch)
treeeaa3ce83fd9677c92ad0f94d0c7f74e3cef9a6da /net/rxrpc/security.c
parente969c92ce597baf6aeff3f619d6c082d736575e0 (diff)
downloadlinux-2cc800863c49a1f4be1b10b756c09a878d3a3f00.tar.gz
linux-2cc800863c49a1f4be1b10b756c09a878d3a3f00.tar.bz2
linux-2cc800863c49a1f4be1b10b756c09a878d3a3f00.zip
rxrpc: Drop rxrpc_conn_parameters from rxrpc_connection and rxrpc_bundle
Remove the rxrpc_conn_parameters struct from the rxrpc_connection and rxrpc_bundle structs and emplace the members directly. These are going to get filled in from the rxrpc_call struct in future. Signed-off-by: David Howells <dhowells@redhat.com> cc: Marc Dionne <marc.dionne@auristor.com> cc: linux-afs@lists.infradead.org
Diffstat (limited to 'net/rxrpc/security.c')
-rw-r--r--net/rxrpc/security.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/rxrpc/security.c b/net/rxrpc/security.c
index 50cb5f1ee0c0..e6ddac9b3732 100644
--- a/net/rxrpc/security.c
+++ b/net/rxrpc/security.c
@@ -69,7 +69,7 @@ int rxrpc_init_client_conn_security(struct rxrpc_connection *conn)
{
const struct rxrpc_security *sec;
struct rxrpc_key_token *token;
- struct key *key = conn->params.key;
+ struct key *key = conn->key;
int ret;
_enter("{%d},{%x}", conn->debug_id, key_serial(key));
@@ -163,7 +163,7 @@ struct key *rxrpc_look_up_server_security(struct rxrpc_connection *conn,
rcu_read_lock();
- rx = rcu_dereference(conn->params.local->service);
+ rx = rcu_dereference(conn->local->service);
if (!rx)
goto out;