diff options
Diffstat (limited to 'net/ipv4/tcp_ipv4.c')
| -rw-r--r-- | net/ipv4/tcp_ipv4.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 5facec2c8..282024cc9 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -5,7 +5,7 @@ * * Implementation of the Transmission Control Protocol(TCP). * - * Version: $Id: tcp_ipv4.c,v 1.207 2000/04/25 04:13:34 davem Exp $ + * Version: $Id: tcp_ipv4.c,v 1.208 2000/05/03 06:37:06 davem Exp $ * * IPv4 specific functions * @@ -2002,14 +2002,14 @@ static void get_tcp_sock(struct sock *sp, char *tmpbuf, int i) srcp = ntohs(sp->sport); timer_active = 0; timer_expires = (unsigned) -1; - if (tp->retransmit_timer.prev != NULL && tp->retransmit_timer.expires < timer_expires) { + if (timer_pending(&tp->retransmit_timer) && tp->retransmit_timer.expires < timer_expires) { timer_active = 1; timer_expires = tp->retransmit_timer.expires; - } else if (tp->probe_timer.prev != NULL && tp->probe_timer.expires < timer_expires) { + } else if (timer_pending(&tp->probe_timer) && tp->probe_timer.expires < timer_expires) { timer_active = 4; timer_expires = tp->probe_timer.expires; } - if (sp->timer.prev != NULL && sp->timer.expires < timer_expires) { + if (timer_pending(&sp->timer) && sp->timer.expires < timer_expires) { timer_active = 2; timer_expires = sp->timer.expires; } |