summaryrefslogtreecommitdiffstats
path: root/net/rxrpc
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2018-10-04 04:32:27 -0400
committerDavid Howells <dhowells@redhat.com>2018-10-04 04:32:27 -0400
commitb3cfb6f567be00450d33b68f743c066af017a012 (patch)
treef2866c757d823ee0437402cd667159b002ea0aab /net/rxrpc
parentd2944b1c66a502ada8aa67f508cd29ecbf035892 (diff)
rxrpc: Emit the data Tx trace line before transmitting
Print the data Tx trace line before transmitting so that it appears before the trace lines indicating success or failure of the transmission. This makes the trace log less confusing. Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'net/rxrpc')
-rw-r--r--net/rxrpc/output.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/rxrpc/output.c b/net/rxrpc/output.c
index e8fb8922bca8..993d4cd247f9 100644
--- a/net/rxrpc/output.c
+++ b/net/rxrpc/output.c
@@ -378,11 +378,13 @@ int rxrpc_send_data_packet(struct rxrpc_call *call, struct sk_buff *skb,
378 if ((lose++ & 7) == 7) { 378 if ((lose++ & 7) == 7) {
379 ret = 0; 379 ret = 0;
380 lost = true; 380 lost = true;
381 goto done;
382 } 381 }
383 } 382 }
384 383
385 _proto("Tx DATA %%%u { #%u }", serial, sp->hdr.seq); 384 trace_rxrpc_tx_data(call, sp->hdr.seq, serial, whdr.flags,
385 retrans, lost);
386 if (lost)
387 goto done;
386 388
387 /* send the packet with the don't fragment bit set if we currently 389 /* send the packet with the don't fragment bit set if we currently
388 * think it's small enough */ 390 * think it's small enough */
@@ -415,8 +417,6 @@ int rxrpc_send_data_packet(struct rxrpc_call *call, struct sk_buff *skb,
415 goto send_fragmentable; 417 goto send_fragmentable;
416 418
417done: 419done:
418 trace_rxrpc_tx_data(call, sp->hdr.seq, serial, whdr.flags,
419 retrans, lost);
420 if (ret >= 0) { 420 if (ret >= 0) {
421 if (whdr.flags & RXRPC_REQUEST_ACK) { 421 if (whdr.flags & RXRPC_REQUEST_ACK) {
422 call->peer->rtt_last_req = skb->tstamp; 422 call->peer->rtt_last_req = skb->tstamp;