diff options
| author | Eric Dumazet | 2014-03-27 15:19:19 +0100 |
|---|---|---|
| committer | David S. Miller | 2014-03-28 21:43:14 +0100 |
| commit | e2a1d3e47bb904082b758dec9d07edf241c45d05 (patch) | |
| tree | 5ed95c32972d85fd1e452ca1572c261ad7e94f0e /net/ipv4/tcp_ipv4.c | |
| parent | openvswitch: fix a possible deadlock and lockdep warning (diff) | |
| download | kernel-qcow2-linux-e2a1d3e47bb904082b758dec9d07edf241c45d05.tar.gz kernel-qcow2-linux-e2a1d3e47bb904082b758dec9d07edf241c45d05.tar.xz kernel-qcow2-linux-e2a1d3e47bb904082b758dec9d07edf241c45d05.zip | |
tcp: fix get_timewait4_sock() delay computation on 64bit
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>
Diffstat (limited to 'net/ipv4/tcp_ipv4.c')
| -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 3cf976510497..1e4eac779f51 100644 --- 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; |