]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
tcp: do not pass timestamp to tcp_rack_identify_loss()
authorEric Dumazet <edumazet@google.com>
Tue, 25 Apr 2017 17:15:35 +0000 (10:15 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 26 Apr 2017 18:44:37 +0000 (14:44 -0400)
Not used anymore now tp->tcp_mstamp holds the information.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Acked-by: Soheil Hassas Yeganeh <soheil@google.com>
Acked-by: Neal Cardwell <ncardwell@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/tcp_input.c

index d4885f7a6a930ff1794b0ab931c0b73c274371b2..99b0d65de169a13679477f49f3733ca00c842090 100644 (file)
@@ -2760,8 +2760,7 @@ static bool tcp_try_undo_partial(struct sock *sk, const int acked)
        return false;
 }
 
-static void tcp_rack_identify_loss(struct sock *sk, int *ack_flag,
-                                  const struct skb_mstamp *ack_time)
+static void tcp_rack_identify_loss(struct sock *sk, int *ack_flag)
 {
        struct tcp_sock *tp = tcp_sk(sk);
 
@@ -2857,11 +2856,11 @@ static void tcp_fastretrans_alert(struct sock *sk, const int acked,
                        tcp_try_keep_open(sk);
                        return;
                }
-               tcp_rack_identify_loss(sk, ack_flag, ack_time);
+               tcp_rack_identify_loss(sk, ack_flag);
                break;
        case TCP_CA_Loss:
                tcp_process_loss(sk, flag, is_dupack, rexmit);
-               tcp_rack_identify_loss(sk, ack_flag, ack_time);
+               tcp_rack_identify_loss(sk, ack_flag);
                if (!(icsk->icsk_ca_state == TCP_CA_Open ||
                      (*ack_flag & FLAG_LOST_RETRANS)))
                        return;
@@ -2877,7 +2876,7 @@ static void tcp_fastretrans_alert(struct sock *sk, const int acked,
                if (icsk->icsk_ca_state <= TCP_CA_Disorder)
                        tcp_try_undo_dsack(sk);
 
-               tcp_rack_identify_loss(sk, ack_flag, ack_time);
+               tcp_rack_identify_loss(sk, ack_flag);
                if (!tcp_time_to_recover(sk, flag)) {
                        tcp_try_to_open(sk, flag);
                        return;