diff options
| author | David Howells <dhowells@redhat.com> | 2016-08-30 09:49:28 +0100 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2016-08-30 15:58:31 +0100 |
| commit | f5c17aaeb2aee9b6c30d082bbe652a7e5589adff (patch) | |
| tree | bc2ec0c32190f3a2de5e1d322d745232ff96771b /net/rxrpc/conn_object.c | |
| parent | ccbd3dbe85e1445231a7e0da2dada130cedce9d0 (diff) | |
rxrpc: Calls should only have one terminal state
Condense the terminal states of a call state machine to a single state,
plus a separate completion type value. The value is then set, along with
error and abort code values, only when the call is transitioned to the
completion state.
Helpers are provided to simplify this.
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'net/rxrpc/conn_object.c')
| -rw-r--r-- | net/rxrpc/conn_object.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/rxrpc/conn_object.c b/net/rxrpc/conn_object.c index 5b45b6c367e7..9c6685b97e70 100644 --- a/net/rxrpc/conn_object.c +++ b/net/rxrpc/conn_object.c @@ -165,8 +165,8 @@ void __rxrpc_disconnect_call(struct rxrpc_connection *conn, * through the channel, whilst disposing of the actual call record. */ chan->last_service_id = call->service_id; - if (call->local_abort) { - chan->last_abort = call->local_abort; + if (call->abort_code) { + chan->last_abort = call->abort_code; chan->last_type = RXRPC_PACKET_TYPE_ABORT; } else { chan->last_seq = call->rx_data_eaten; |