diff options
| author | Arnaldo Carvalho de Melo <acme@conectiva.com.br> | 2004-06-21 21:52:32 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@conectiva.com.br> | 2004-06-21 21:52:32 -0300 |
| commit | a09a83869eeaed66b44bb8e82944efacd9533310 (patch) | |
| tree | be1f506d02faa5f4b2cfc40d921dbf727550e0ce /net/ipv4/tcp_timer.c | |
| parent | 6511d74e8502c38b02bbbdaa38004fa53d2745e8 (diff) | |
[NET] move send_head from tcp private area to struct sock
The poor cousins also need this, LLC will be the first to use it.
Signed-off-by: Arnaldo Carvalho de Melo <acme@conectiva.com.br>
Diffstat (limited to 'net/ipv4/tcp_timer.c')
| -rw-r--r-- | net/ipv4/tcp_timer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c index cab2678b1958..44615198e6a1 100644 --- a/net/ipv4/tcp_timer.c +++ b/net/ipv4/tcp_timer.c @@ -269,7 +269,7 @@ static void tcp_probe_timer(struct sock *sk) struct tcp_opt *tp = tcp_sk(sk); int max_probes; - if (tp->packets_out || !tp->send_head) { + if (tp->packets_out || !sk->sk_send_head) { tp->probes_out = 0; return; } @@ -606,7 +606,7 @@ static void tcp_keepalive_timer (unsigned long data) elapsed = keepalive_time_when(tp); /* It is alive without keepalive 8) */ - if (tp->packets_out || tp->send_head) + if (tp->packets_out || sk->sk_send_head) goto resched; elapsed = tcp_time_stamp - tp->rcv_tstamp; |