tcp: fix get_timewait4_sock() delay computation on 64bit

edumazet · davem330 · commit e2a1d3e47bb9 · 2014-03-28T16:43:14.000-04:00
It seems I missed one change in get_timewait4_sock() to compute the remaining time before deletion of IPV4 timewait socket. This could result in wrong output in /proc/net/tcp for tm->when field. Fixes: 96f817f ("tcp: shrink tcp6_timewait_sock by one cache line") Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
@@ -2628,7 +2628,7 @@ static void get_timewait4_sock(const struct inet_timewait_sock *tw,
 {
 	__be32 dest, src;
 	__u16 destp, srcp;
-	long delta = tw->tw_ttd - jiffies;
+	s32 delta = tw->tw_ttd - inet_tw_time_stamp();
 
 	dest  = tw->tw_daddr;
 	src   = tw->tw_rcv_saddr;

Original file line number	Diff line number	Diff line change
`@@ -2628,7 +2628,7 @@ static void get_timewait4_sock(const struct inet_timewait_sock *tw,`
`2628`	`2628`	`{`
`2629`	`2629`	`__be32 dest, src;`
`2630`	`2630`	`__u16 destp, srcp;`
`2631`		`- long delta = tw->tw_ttd - jiffies;`
	`2631`	`+ s32 delta = tw->tw_ttd - inet_tw_time_stamp();`
`2632`	`2632`
`2633`	`2633`	`dest = tw->tw_daddr;`
`2634`	`2634`	`src = tw->tw_rcv_saddr;`