Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 66318
b: refs/heads/master
c: 6728e7d
h: refs/heads/master
v: v3
  • Loading branch information
Ilpo Järvinen authored and David S. Miller committed Oct 10, 2007
1 parent 77f139f commit de94745
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6ff03ac355cc6c10f7b1f44dd466d41213acebca
refs/heads/master: 6728e7dc3e577241f36921c720cfb4eb8f5aed1a
5 changes: 2 additions & 3 deletions trunk/net/ipv4/tcp_input.c
Original file line number Diff line number Diff line change
Expand Up @@ -2424,8 +2424,7 @@ static void tcp_cong_avoid(struct sock *sk, u32 ack,
/* Restart timer after forward progress on connection.
* RFC2988 recommends to restart timer to now+rto.
*/

static void tcp_ack_packets_out(struct sock *sk)
static void tcp_rearm_rto(struct sock *sk)
{
struct tcp_sock *tp = tcp_sk(sk);

Expand Down Expand Up @@ -2581,7 +2580,7 @@ static int tcp_clean_rtx_queue(struct sock *sk, __s32 *seq_rtt_p)
= inet_csk(sk)->icsk_ca_ops;

tcp_ack_update_rtt(sk, acked, seq_rtt);
tcp_ack_packets_out(sk);
tcp_rearm_rto(sk);

if (tcp_is_reno(tp))
tcp_remove_reno_sacks(sk, pkts_acked);
Expand Down

0 comments on commit de94745

Please sign in to comment.