diff options
| author | David Howells <dhowells@redhat.com> | 2016-04-04 14:00:36 +0100 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2016-06-22 09:09:59 +0100 |
| commit | 19ffa01c9c45861ad6b181323e0d36904298e326 (patch) | |
| tree | b81cd9ec90ca2c51829ffe9f765fd7a6b26e5e7b /net/rxrpc/call_event.c | |
| parent | 2f9f9f5210887b1019fbd0327ffdf7c3aff271fd (diff) | |
| download | op-kernel-dev-19ffa01c9c45861ad6b181323e0d36904298e326.zip op-kernel-dev-19ffa01c9c45861ad6b181323e0d36904298e326.tar.gz | |
rxrpc: Use structs to hold connection params and protocol info
Define and use a structure to hold connection parameters. This makes it
easier to pass multiple connection parameters around.
Define and use a structure to hold protocol information used to hash a
connection for lookup on incoming packet. Most of these fields will be
disposed of eventually, including the duplicate local pointer.
Whilst we're at it rename "proto" to "family" when referring to a protocol
family.
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'net/rxrpc/call_event.c')
| -rw-r--r-- | net/rxrpc/call_event.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/rxrpc/call_event.c b/net/rxrpc/call_event.c index e610b10..1571dfb 100644 --- a/net/rxrpc/call_event.c +++ b/net/rxrpc/call_event.c @@ -842,7 +842,7 @@ void rxrpc_process_call(struct work_struct *work) msg.msg_controllen = 0; msg.msg_flags = 0; - whdr.epoch = htonl(call->conn->epoch); + whdr.epoch = htonl(call->conn->proto.epoch); whdr.cid = htonl(call->cid); whdr.callNumber = htonl(call->call_id); whdr.seq = 0; @@ -1264,7 +1264,7 @@ maybe_reschedule: if (call->state >= RXRPC_CALL_COMPLETE && !list_empty(&call->accept_link)) { _debug("X unlinking once-pending call %p { e=%lx f=%lx c=%x }", - call, call->events, call->flags, call->conn->cid); + call, call->events, call->flags, call->conn->proto.cid); read_lock_bh(&call->state_lock); if (!test_bit(RXRPC_CALL_RELEASED, &call->flags) && @@ -1282,7 +1282,7 @@ error: * this means there's a race between clearing the flag and setting the * work pending bit and the work item being processed again */ if (call->events && !work_pending(&call->processor)) { - _debug("jumpstart %x", call->conn->cid); + _debug("jumpstart %x", call->conn->proto.cid); rxrpc_queue_call(call); } |
