aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2016-09-29 17:37:16 -0400
committerDavid Howells <dhowells@redhat.com>2016-09-29 17:57:47 -0400
commited1e8679d8bc6537077d1f24bc83b396f6062f09 (patch)
treea839604480612fbb3bbcff8771c7397b618f1ec2
parentb112a67081e4b06652ecde588bf1d5778fe43d75 (diff)
rxrpc: Note serial number being ACK'd in the congestion management trace
Note the serial number of the packet being ACK'd in the congestion management trace rather than the serial number of the ACK packet. Whilst the serial number of the ACK packet is useful for matching ACK packet in the output of wireshark, the serial number that the ACK is in response to is of more use in working out how different trace lines relate. Signed-off-by: David Howells <dhowells@redhat.com>
-rw-r--r--net/rxrpc/input.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/rxrpc/input.c b/net/rxrpc/input.c
index 094720dd1eaf..1461d30583c9 100644
--- a/net/rxrpc/input.c
+++ b/net/rxrpc/input.c
@@ -41,10 +41,10 @@ static void rxrpc_proto_abort(const char *why,
41 */ 41 */
42static void rxrpc_congestion_management(struct rxrpc_call *call, 42static void rxrpc_congestion_management(struct rxrpc_call *call,
43 struct sk_buff *skb, 43 struct sk_buff *skb,
44 struct rxrpc_ack_summary *summary) 44 struct rxrpc_ack_summary *summary,
45 rxrpc_serial_t acked_serial)
45{ 46{
46 enum rxrpc_congest_change change = rxrpc_cong_no_change; 47 enum rxrpc_congest_change change = rxrpc_cong_no_change;
47 struct rxrpc_skb_priv *sp = rxrpc_skb(skb);
48 unsigned int cumulative_acks = call->cong_cumul_acks; 48 unsigned int cumulative_acks = call->cong_cumul_acks;
49 unsigned int cwnd = call->cong_cwnd; 49 unsigned int cwnd = call->cong_cwnd;
50 bool resend = false; 50 bool resend = false;
@@ -172,7 +172,7 @@ out_no_clear_ca:
172 cwnd = RXRPC_RXTX_BUFF_SIZE - 1; 172 cwnd = RXRPC_RXTX_BUFF_SIZE - 1;
173 call->cong_cwnd = cwnd; 173 call->cong_cwnd = cwnd;
174 call->cong_cumul_acks = cumulative_acks; 174 call->cong_cumul_acks = cumulative_acks;
175 trace_rxrpc_congest(call, summary, sp->hdr.serial, change); 175 trace_rxrpc_congest(call, summary, acked_serial, change);
176 if (resend && !test_and_set_bit(RXRPC_CALL_EV_RESEND, &call->events)) 176 if (resend && !test_and_set_bit(RXRPC_CALL_EV_RESEND, &call->events))
177 rxrpc_queue_call(call); 177 rxrpc_queue_call(call);
178 return; 178 return;
@@ -848,7 +848,7 @@ static void rxrpc_input_ack(struct rxrpc_call *call, struct sk_buff *skb,
848 false, true, 848 false, true,
849 rxrpc_propose_ack_ping_for_lost_reply); 849 rxrpc_propose_ack_ping_for_lost_reply);
850 850
851 return rxrpc_congestion_management(call, skb, &summary); 851 return rxrpc_congestion_management(call, skb, &summary, acked_serial);
852} 852}
853 853
854/* 854/*