diff options
| author |   David Howells <dhowells@redhat.com> | 2019-12-18 16:38:49 +0000 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2019-12-20 16:20:48 +0000 |
| commit | f33121cbe91973a08e68e4bde8c3f7e6e4e351c1 (patch) | |
| tree | 29a7d330b0a1b37db09e515e652a925820b088ed /net/rxrpc/input.c | |
| parent | nfc: s3fwrn5: replace the assertion with a WARN_ON (diff) | |
| download | linux-dev-f33121cbe91973a08e68e4bde8c3f7e6e4e351c1.tar.xz linux-dev-f33121cbe91973a08e68e4bde8c3f7e6e4e351c1.zip | |
rxrpc: Unlock new call in rxrpc_new_incoming_call() rather than the caller
Move the unlock and the ping transmission for a new incoming call into
rxrpc_new_incoming_call() rather than doing it in the caller. This makes
it clearer to see what's going on.
Suggested-by: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
cc: Ingo Molnar <mingo@redhat.com>
cc: Will Deacon <will@kernel.org>
cc: Davidlohr Bueso <dave@stgolabs.net>
Diffstat (limited to '')
| -rw-r--r-- | net/rxrpc/input.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/net/rxrpc/input.c b/net/rxrpc/input.c index 157be1ff8697..86bd133b4fa0 100644 --- a/net/rxrpc/input.c +++ b/net/rxrpc/input.c @@ -193,22 +193,6 @@ send_extra_data: } /* - * Ping the other end to fill our RTT cache and to retrieve the rwind - * and MTU parameters. - */ -static void rxrpc_send_ping(struct rxrpc_call *call, struct sk_buff *skb) -{ - struct rxrpc_skb_priv *sp = rxrpc_skb(skb); - ktime_t now = skb->tstamp; - - if (call->peer->rtt_usage < 3 || - ktime_before(ktime_add_ms(call->peer->rtt_last_req, 1000), now)) - rxrpc_propose_ACK(call, RXRPC_ACK_PING, sp->hdr.serial, - true, true, - rxrpc_propose_ack_ping_for_params); -} - -/* * Apply a hard ACK by advancing the Tx window. */ static bool rxrpc_rotate_tx_window(struct rxrpc_call *call, rxrpc_seq_t to, @@ -1396,8 +1380,6 @@ int rxrpc_input_packet(struct sock *udp_sk, struct sk_buff *skb) call = rxrpc_new_incoming_call(local, rx, skb); if (!call) goto reject_packet; - rxrpc_send_ping(call, skb); - mutex_unlock(&call->user_mutex); } /* Process a call packet; this either discards or passes on the ref |