rxrpc: Add data Tx tracepoint and adjust Tx ACK tracepoint

Add a tracepoint to log transmission of DATA packets (including loss
injection).

Adjust the ACK transmission tracepoint to include the packet serial number
and to line this up with the DATA transmission display.

Signed-off-by: David Howells <dhowells@redhat.com>

1 files changed, 2 insertions, 3 deletions

diff --git a/net/rxrpc/conn_event.c b/net/rxrpc/conn_event.c
index 75a15a4c74c3..a1cf1ec5f29e 100644
--- a/net/rxrpc/conn_event.c
+++ b/net/rxrpc/conn_event.c
@@ -98,9 +98,6 @@ static void rxrpc_conn_retransmit_call(struct rxrpc_connection *conn,
                 pkt.info.rwind          = htonl(rxrpc_rx_window_size);
                 pkt.info.jumbo_max      = htonl(rxrpc_rx_jumbo_max);
                 len += sizeof(pkt.ack) + sizeof(pkt.info);
-
-                trace_rxrpc_tx_ack(NULL, chan->last_seq, 0,
-                                   RXRPC_ACK_DUPLICATE, 0);
                 break;
         }
 
@@ -122,6 +119,8 @@ static void rxrpc_conn_retransmit_call(struct rxrpc_connection *conn,
                 _proto("Tx ABORT %%%u { %d } [re]", serial, conn->local_abort);
                 break;
         case RXRPC_PACKET_TYPE_ACK:
+                trace_rxrpc_tx_ack(NULL, serial, chan->last_seq, 0,
+                                   RXRPC_ACK_DUPLICATE, 0);
                 _proto("Tx ACK %%%u [re]", serial);
                 break;
         }