]> err.no Git - linux-2.6/commitdiff
[TCP]: Rename tcp_ack_packets_out -> tcp_rearm_rto
authorIlpo Järvinen <ilpo.jarvinen@helsinki.fi>
Sat, 25 Aug 2007 05:53:26 +0000 (22:53 -0700)
committerDavid S. Miller <davem@sunset.davemloft.net>
Wed, 10 Oct 2007 23:48:28 +0000 (16:48 -0700)
Only thing that tiny function does is rearming the RTO (if
necessary), name it accordingly.

Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/tcp_input.c

index 593960d66ed968e8a8499cf272bd96acc137d350..0ead46f2bcd53963a57b84763dd8e3200ac2b975 100644 (file)
@@ -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);
 
@@ -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);