diff options
| author | David Howells <dhowells@redhat.com> | 2022-10-19 14:49:02 +0200 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2022-12-01 14:36:38 +0100 |
| commit | 2cc800863c49a1f4be1b10b756c09a878d3a3f00 (patch) | |
| tree | eaa3ce83fd9677c92ad0f94d0c7f74e3cef9a6da /net/rxrpc/input.c | |
| parent | rxrpc: Remove the [_k]net() debugging macros (diff) | |
| download | linux-2cc800863c49a1f4be1b10b756c09a878d3a3f00.tar.xz 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/input.c')
| -rw-r--r-- | net/rxrpc/input.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/rxrpc/input.c b/net/rxrpc/input.c index e2461f29d765..44caf88e04b8 100644 --- a/net/rxrpc/input.c +++ b/net/rxrpc/input.c @@ -1339,10 +1339,10 @@ int rxrpc_input_packet(struct sock *udp_sk, struct sk_buff *skb) if (!test_bit(RXRPC_CONN_PROBING_FOR_UPGRADE, &conn->flags)) goto reupgrade; - old_id = cmpxchg(&conn->service_id, conn->params.service_id, + old_id = cmpxchg(&conn->service_id, conn->orig_service_id, sp->hdr.serviceId); - if (old_id != conn->params.service_id && + if (old_id != conn->orig_service_id && old_id != sp->hdr.serviceId) goto reupgrade; } |