diff options
| author | David Howells <dhowells@redhat.com> | 2016-08-23 17:27:25 +0300 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2016-08-23 18:02:35 +0300 |
| commit | 18bfeba50dfd0c8ee420396f2570f16a0bdbd7de (patch) | |
| tree | 3b3a896ce8212cc31070c890a2a9f24fe572f4dd /net/rxrpc/conn_object.c | |
| parent | 563ea7d5d4eaf0ff63ddcaf8ed849eb88bb5738d (diff) | |
| download | linux-18bfeba50dfd0c8ee420396f2570f16a0bdbd7de.tar.xz | |
rxrpc: Perform terminal call ACK/ABORT retransmission from conn processor
Perform terminal call ACK/ABORT retransmission in the connection processor
rather than in the call processor. With this change, once last_call is
set, no more incoming packets will be routed to the corresponding call or
any earlier calls on that channel (call IDs must only increase on a channel
on a connection).
Further, if a packet's callNumber is before the last_call ID or a packet is
aimed at successfully completed service call then that packet is discarded
and ignored.
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'net/rxrpc/conn_object.c')
| -rw-r--r-- | net/rxrpc/conn_object.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/net/rxrpc/conn_object.c b/net/rxrpc/conn_object.c index 743f0bb4aaa8..b4af37ebb112 100644 --- a/net/rxrpc/conn_object.c +++ b/net/rxrpc/conn_object.c @@ -166,7 +166,15 @@ void __rxrpc_disconnect_call(struct rxrpc_call *call) /* Save the result of the call so that we can repeat it if necessary * through the channel, whilst disposing of the actual call record. */ - chan->last_result = call->local_abort; + chan->last_service_id = call->service_id; + if (call->local_abort) { + chan->last_abort = call->local_abort; + chan->last_type = RXRPC_PACKET_TYPE_ABORT; + } else { + chan->last_seq = call->rx_data_eaten; + chan->last_type = RXRPC_PACKET_TYPE_ACK; + } + /* Sync with rxrpc_conn_retransmit(). */ smp_wmb(); chan->last_call = chan->call_id; chan->call_id = chan->call_counter; |