]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
rxrpc: Emit the data Tx trace line before transmitting
authorDavid Howells <dhowells@redhat.com>
Thu, 4 Oct 2018 08:32:27 +0000 (09:32 +0100)
committerDavid Howells <dhowells@redhat.com>
Thu, 4 Oct 2018 08:32:27 +0000 (09:32 +0100)
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>
net/rxrpc/output.c

index e8fb8922bca838d145ca2c83a145ad5050aae6ea..993d4cd247f9a9bdf7ac7652f151ab135fac54b9 100644 (file)
@@ -378,11 +378,13 @@ int rxrpc_send_data_packet(struct rxrpc_call *call, struct sk_buff *skb,
                if ((lose++ & 7) == 7) {
                        ret = 0;
                        lost = true;
-                       goto done;
                }
        }
 
-       _proto("Tx DATA %%%u { #%u }", serial, sp->hdr.seq);
+       trace_rxrpc_tx_data(call, sp->hdr.seq, serial, whdr.flags,
+                           retrans, lost);
+       if (lost)
+               goto done;
 
        /* send the packet with the don't fragment bit set if we currently
         * think it's small enough */
@@ -415,8 +417,6 @@ int rxrpc_send_data_packet(struct rxrpc_call *call, struct sk_buff *skb,
                goto send_fragmentable;
 
 done:
-       trace_rxrpc_tx_data(call, sp->hdr.seq, serial, whdr.flags,
-                           retrans, lost);
        if (ret >= 0) {
                if (whdr.flags & RXRPC_REQUEST_ACK) {
                        call->peer->rtt_last_req = skb->tstamp;