aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/tcp_input.c
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2017-04-25 13:15:35 -0400
committerDavid S. Miller <davem@davemloft.net>2017-04-26 14:44:37 -0400
commitefab8f85826afbbfe4b0ca9208e006aabbd2df3a (patch)
tree0c7e95cd8c13c8953498abdc8b54b7ae8f392333 /net/ipv4/tcp_input.c
parent128eda86bebeacefb0fcc64cab0155aa76857c92 (diff)
tcp: do not pass timestamp to tcp_rack_identify_loss()
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>
Diffstat (limited to 'net/ipv4/tcp_input.c')
-rw-r--r--net/ipv4/tcp_input.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index d4885f7a6a93..99b0d65de169 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -2760,8 +2760,7 @@ static bool tcp_try_undo_partial(struct sock *sk, const int acked)
2760 return false; 2760 return false;
2761} 2761}
2762 2762
2763static void tcp_rack_identify_loss(struct sock *sk, int *ack_flag, 2763static void tcp_rack_identify_loss(struct sock *sk, int *ack_flag)
2764 const struct skb_mstamp *ack_time)
2765{ 2764{
2766 struct tcp_sock *tp = tcp_sk(sk); 2765 struct tcp_sock *tp = tcp_sk(sk);
2767 2766
@@ -2857,11 +2856,11 @@ static void tcp_fastretrans_alert(struct sock *sk, const int acked,
2857 tcp_try_keep_open(sk); 2856 tcp_try_keep_open(sk);
2858 return; 2857 return;
2859 } 2858 }
2860 tcp_rack_identify_loss(sk, ack_flag, ack_time); 2859 tcp_rack_identify_loss(sk, ack_flag);
2861 break; 2860 break;
2862 case TCP_CA_Loss: 2861 case TCP_CA_Loss:
2863 tcp_process_loss(sk, flag, is_dupack, rexmit); 2862 tcp_process_loss(sk, flag, is_dupack, rexmit);
2864 tcp_rack_identify_loss(sk, ack_flag, ack_time); 2863 tcp_rack_identify_loss(sk, ack_flag);
2865 if (!(icsk->icsk_ca_state == TCP_CA_Open || 2864 if (!(icsk->icsk_ca_state == TCP_CA_Open ||
2866 (*ack_flag & FLAG_LOST_RETRANS))) 2865 (*ack_flag & FLAG_LOST_RETRANS)))
2867 return; 2866 return;
@@ -2877,7 +2876,7 @@ static void tcp_fastretrans_alert(struct sock *sk, const int acked,
2877 if (icsk->icsk_ca_state <= TCP_CA_Disorder) 2876 if (icsk->icsk_ca_state <= TCP_CA_Disorder)
2878 tcp_try_undo_dsack(sk); 2877 tcp_try_undo_dsack(sk);
2879 2878
2880 tcp_rack_identify_loss(sk, ack_flag, ack_time); 2879 tcp_rack_identify_loss(sk, ack_flag);
2881 if (!tcp_time_to_recover(sk, flag)) { 2880 if (!tcp_time_to_recover(sk, flag)) {
2882 tcp_try_to_open(sk, flag); 2881 tcp_try_to_open(sk, flag);
2883 return; 2882 return;