* [PATCH net] tcp: record TLP and ER timer stats in v6 stats
@ 2016-06-06 22:07 Yuchung Cheng
2016-06-08 0:13 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Yuchung Cheng @ 2016-06-06 22:07 UTC (permalink / raw)
To: davem; +Cc: netdev, nanditad, Yuchung Cheng, Neal Cardwell
The v6 tcp stats scan do not provide TLP and ER timer information
correctly like the v4 version . This patch fixes that.
Fixes: 6ba8a3b19e76 ("tcp: Tail loss probe (TLP)")
Fixes: eed530b6c676 ("tcp: early retransmit")
Signed-off-by: Yuchung Cheng <ycheng@google.com>
Signed-off-by: Neal Cardwell <ncardwell@google.com>
---
net/ipv6/tcp_ipv6.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 4ad8edb..d1fc453 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -1707,7 +1707,9 @@ static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i)
destp = ntohs(inet->inet_dport);
srcp = ntohs(inet->inet_sport);
- if (icsk->icsk_pending == ICSK_TIME_RETRANS) {
+ if (icsk->icsk_pending == ICSK_TIME_RETRANS ||
+ icsk->icsk_pending == ICSK_TIME_EARLY_RETRANS ||
+ icsk->icsk_pending == ICSK_TIME_LOSS_PROBE) {
timer_active = 1;
timer_expires = icsk->icsk_timeout;
} else if (icsk->icsk_pending == ICSK_TIME_PROBE0) {
--
2.8.0.rc3.226.g39d4020
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net] tcp: record TLP and ER timer stats in v6 stats
2016-06-06 22:07 [PATCH net] tcp: record TLP and ER timer stats in v6 stats Yuchung Cheng
@ 2016-06-08 0:13 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2016-06-08 0:13 UTC (permalink / raw)
To: ycheng; +Cc: netdev, nanditad, ncardwell
From: Yuchung Cheng <ycheng@google.com>
Date: Mon, 6 Jun 2016 15:07:18 -0700
> The v6 tcp stats scan do not provide TLP and ER timer information
> correctly like the v4 version . This patch fixes that.
>
> Fixes: 6ba8a3b19e76 ("tcp: Tail loss probe (TLP)")
> Fixes: eed530b6c676 ("tcp: early retransmit")
> Signed-off-by: Yuchung Cheng <ycheng@google.com>
> Signed-off-by: Neal Cardwell <ncardwell@google.com>
Applied and queued up for -stable, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-06-08 0:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-06-06 22:07 [PATCH net] tcp: record TLP and ER timer stats in v6 stats Yuchung Cheng
2016-06-08 0:13 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).