diff options
| author | James Morris <jmorris@intercode.com.au> | 2003-03-02 12:57:04 -0800 |
|---|---|---|
| committer | David S. Miller <davem@nuts.ninka.net> | 2003-03-02 12:57:04 -0800 |
| commit | bd698d6854049c0d493956b8cb4265053ae0a248 (patch) | |
| tree | 9e6bd193e3f6da90449b9bd300fa359f270de029 /net/ipv4/tcp_timer.c | |
| parent | ffbd6a98b8b781b78ad7e2afe7cb84a4a0ee0b68 (diff) | |
[NET]: Convert volatile char socket flags to real bitops mask, work by Pedro Hortas.
Diffstat (limited to 'net/ipv4/tcp_timer.c')
| -rw-r--r-- | net/ipv4/tcp_timer.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c index fc2102496536..4763edf791f7 100644 --- a/net/ipv4/tcp_timer.c +++ b/net/ipv4/tcp_timer.c @@ -189,7 +189,7 @@ static int tcp_write_timeout(struct sock *sk) } retry_until = sysctl_tcp_retries2; - if (sk->dead) { + if (test_bit(SOCK_DEAD, &sk->flags)) { int alive = (tp->rto < TCP_RTO_MAX); retry_until = tcp_orphan_retries(sk, alive); @@ -297,7 +297,7 @@ static void tcp_probe_timer(struct sock *sk) */ max_probes = sysctl_tcp_retries2; - if (sk->dead) { + if (test_bit(SOCK_DEAD, &sk->flags)) { int alive = ((tp->rto<<tp->backoff) < TCP_RTO_MAX); max_probes = tcp_orphan_retries(sk, alive); @@ -327,7 +327,7 @@ static void tcp_retransmit_timer(struct sock *sk) BUG_TRAP(!skb_queue_empty(&sk->write_queue)); - if (tp->snd_wnd == 0 && !sk->dead && + if (tp->snd_wnd == 0 && !test_bit(SOCK_DEAD, &sk->flags) && !((1<<sk->state)&(TCPF_SYN_SENT|TCPF_SYN_RECV))) { /* Receiver dastardly shrinks window. Our retransmits * become zero probes, but we should not timeout this @@ -571,7 +571,7 @@ void tcp_set_keepalive(struct sock *sk, int val) if ((1<<sk->state)&(TCPF_CLOSE|TCPF_LISTEN)) return; - if (val && !sk->keepopen) + if (val && !test_bit(SOCK_KEEPOPEN, &sk->flags)) tcp_reset_keepalive_timer(sk, keepalive_time_when(tcp_sk(sk))); else if (!val) tcp_delete_keepalive_timer(sk); @@ -597,7 +597,7 @@ static void tcp_keepalive_timer (unsigned long data) goto out; } - if (sk->state == TCP_FIN_WAIT2 && sk->dead) { + if (sk->state == TCP_FIN_WAIT2 && test_bit(SOCK_DEAD, &sk->flags)) { if (tp->linger2 >= 0) { int tmo = tcp_fin_time(tp) - TCP_TIMEWAIT_LEN; @@ -610,7 +610,7 @@ static void tcp_keepalive_timer (unsigned long data) goto death; } - if (!sk->keepopen || sk->state == TCP_CLOSE) + if (!test_bit(SOCK_KEEPOPEN, &sk->flags) || sk->state == TCP_CLOSE) goto out; elapsed = keepalive_time_when(tp); |