aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/tcp_input.c
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2017-04-25 13:15:40 -0400
committerDavid S. Miller <davem@davemloft.net>2017-04-26 14:44:38 -0400
commita6db50b81e3f20b2b692bbddd35d9484057eae9d (patch)
tree8d478d2cee4ffd32b702ccc527631cbcdd845205 /net/ipv4/tcp_input.c
parent7e0ca8a4c19c5fbaa802ffd609f5f9ab9249af5d (diff)
tcp: remove ack_time from struct tcp_sacktag_state
It is no longer needed, everything uses tp->tcp_mstamp instead. 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.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index f4e1836c696c..f475f0b53bfe 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -1131,7 +1131,6 @@ struct tcp_sacktag_state {
1131 */ 1131 */
1132 struct skb_mstamp first_sackt; 1132 struct skb_mstamp first_sackt;
1133 struct skb_mstamp last_sackt; 1133 struct skb_mstamp last_sackt;
1134 struct skb_mstamp ack_time; /* Timestamp when the S/ACK was received */
1135 struct rate_sample *rate; 1134 struct rate_sample *rate;
1136 int flag; 1135 int flag;
1137}; 1136};
@@ -3572,8 +3571,6 @@ static int tcp_ack(struct sock *sk, const struct sk_buff *skb, int flag)
3572 if (after(ack, tp->snd_nxt)) 3571 if (after(ack, tp->snd_nxt))
3573 goto invalid_ack; 3572 goto invalid_ack;
3574 3573
3575 skb_mstamp_get(&sack_state.ack_time);
3576
3577 if (icsk->icsk_pending == ICSK_TIME_LOSS_PROBE) 3574 if (icsk->icsk_pending == ICSK_TIME_LOSS_PROBE)
3578 tcp_rearm_rto(sk); 3575 tcp_rearm_rto(sk);
3579 3576
@@ -3684,7 +3681,6 @@ old_ack:
3684 * If data was DSACKed, see if we can undo a cwnd reduction. 3681 * If data was DSACKed, see if we can undo a cwnd reduction.
3685 */ 3682 */
3686 if (TCP_SKB_CB(skb)->sacked) { 3683 if (TCP_SKB_CB(skb)->sacked) {
3687 skb_mstamp_get(&sack_state.ack_time);
3688 flag |= tcp_sacktag_write_queue(sk, skb, prior_snd_una, 3684 flag |= tcp_sacktag_write_queue(sk, skb, prior_snd_una,
3689 &sack_state); 3685 &sack_state);
3690 tcp_fastretrans_alert(sk, acked, is_dupack, &flag, &rexmit); 3686 tcp_fastretrans_alert(sk, acked, is_dupack, &flag, &rexmit);