diff options
| author | David Howells | 2017-06-05 15:30:49 +0200 |
|---|---|---|
| committer | David Howells | 2017-06-05 15:30:49 +0200 |
| commit | 68d6d1ae5c0429bcc8911e1db5f80fe2cd1ca974 (patch) | |
| tree | fe2a180323f93465622820a2b59effbcaec62641 /net/rxrpc/ar-internal.h | |
| parent | Merge branch 'mlxsw-Minor-cleanup' (diff) | |
| download | kernel-qcow2-linux-68d6d1ae5c0429bcc8911e1db5f80fe2cd1ca974.tar.gz kernel-qcow2-linux-68d6d1ae5c0429bcc8911e1db5f80fe2cd1ca974.tar.xz kernel-qcow2-linux-68d6d1ae5c0429bcc8911e1db5f80fe2cd1ca974.zip | |
rxrpc: Separate the connection's protocol service ID from the lookup ID
Keep the rxrpc_connection struct's idea of the service ID that is exposed
in the protocol separate from the service ID that's used as a lookup key.
This allows the protocol service ID on a client connection to get upgraded
without making the connection unfindable for other client calls that also
would like to use the upgraded connection.
The connection's actual service ID is then returned through recvmsg() by
way of msg_name.
Whilst we're at it, we get rid of the last_service_id field from each
channel. The service ID is per-connection, not per-call and an entire
connection is upgraded in one go.
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'net/rxrpc/ar-internal.h')
| -rw-r--r-- | net/rxrpc/ar-internal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/rxrpc/ar-internal.h b/net/rxrpc/ar-internal.h index 067dbb3121d0..de98a49adb35 100644 --- a/net/rxrpc/ar-internal.h +++ b/net/rxrpc/ar-internal.h @@ -386,7 +386,6 @@ struct rxrpc_connection { u32 call_counter; /* Call ID counter */ u32 last_call; /* ID of last call */ u8 last_type; /* Type of last packet */ - u16 last_service_id; union { u32 last_seq; u32 last_abort; @@ -417,6 +416,7 @@ struct rxrpc_connection { atomic_t serial; /* packet serial number counter */ unsigned int hi_serial; /* highest serial number received */ u32 security_nonce; /* response re-use preventer */ + u16 service_id; /* Service ID, possibly upgraded */ u8 size_align; /* data size alignment (for security) */ u8 security_size; /* security header size */ u8 security_ix; /* security type */ |