diff options
| author | Eric Dumazet <edumazet@google.com> | 2014-03-27 07:19:19 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-04-14 06:47:21 -0700 |
| commit | 569e4b6489af7e15a10c543b472356a1724a1491 (patch) | |
| tree | 1dce29b5b84929aa4ddb289f5a799d71afe61c61 | |
| parent | f0213f63e141fd6f023e263180db1ce91ef3cb55 (diff) | |
tcp: fix get_timewait4_sock() delay computation on 64bit
[ Upstream commit e2a1d3e47bb904082b758dec9d07edf241c45d05 ]
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: 96f817fedec4 ("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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | net/ipv4/tcp_ipv4.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 067213924751..1d7b9ddb94d0 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -2629,7 +2629,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; |