diff options
| author |   David Howells <dhowells@redhat.com> | 2016-08-23 15:27:24 +0100 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2016-08-23 15:27:24 +0100 |
| commit | 01a90a459850ed1f1573f06f00f7b9d466339df0 (patch) | |
| tree | 41a4aa08b699f82b2e401ffc83759ebbe3545693 /net/rxrpc/rxkad.c | |
| parent | rxrpc: When clearing a socket, clear the call sets in the right order (diff) | |
| download | linux-dev-01a90a459850ed1f1573f06f00f7b9d466339df0.tar.xz linux-dev-01a90a459850ed1f1573f06f00f7b9d466339df0.zip | |
rxrpc: Drop channel number field from rxrpc_call struct
Drop the channel number (channel) field from the rxrpc_call struct to
reduce the size of the call struct. The field is redundant: if the call is
attached to a connection, the channel can be obtained from there by AND'ing
with RXRPC_CHANNELMASK.
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to '')
| -rw-r--r-- | net/rxrpc/rxkad.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/rxrpc/rxkad.c b/net/rxrpc/rxkad.c index 63afa9e9cc08..89f475febfd7 100644 --- a/net/rxrpc/rxkad.c +++ b/net/rxrpc/rxkad.c @@ -275,7 +275,7 @@ static int rxkad_secure_packet(struct rxrpc_call *call, memcpy(&iv, call->conn->csum_iv.x, sizeof(iv)); /* calculate the security checksum */ - x = call->channel << (32 - RXRPC_CIDSHIFT); + x = (call->cid & RXRPC_CHANNELMASK) << (32 - RXRPC_CIDSHIFT); x |= sp->hdr.seq & 0x3fffffff; call->crypto_buf[0] = htonl(sp->hdr.callNumber); call->crypto_buf[1] = htonl(x); @@ -507,7 +507,7 @@ static int rxkad_verify_packet(struct rxrpc_call *call, memcpy(&iv, call->conn->csum_iv.x, sizeof(iv)); /* validate the security checksum */ - x = call->channel << (32 - RXRPC_CIDSHIFT); + x = (call->cid & RXRPC_CHANNELMASK) << (32 - RXRPC_CIDSHIFT); x |= sp->hdr.seq & 0x3fffffff; call->crypto_buf[0] = htonl(call->call_id); call->crypto_buf[1] = htonl(x); |