diff options
| author | Eric Dumazet <edumazet@google.com> | 2017-04-25 10:15:37 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-04-26 14:44:38 -0400 |
| commit | 88d5c65098e5d15f2cea81f90bb6ecc167e1aa3b (patch) | |
| tree | 6766616cf1893276f5d5c30845e4d88615305d7c /net/ipv4/tcp_input.c | |
| parent | 1317a9d69f5fa0f5417237772f55a4aac49f7921 (diff) | |
| download | lwn-88d5c65098e5d15f2cea81f90bb6ecc167e1aa3b.tar.gz lwn-88d5c65098e5d15f2cea81f90bb6ecc167e1aa3b.zip | |
tcp: do not pass timestamp to tcp_rate_gen()
No longer needed, since tp->tcp_mstamp holds the information.
This is needed to remove sack_state.ack_time in a following patch.
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.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 68094aa8cfb2..2d84483de2e1 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -3657,8 +3657,7 @@ static int tcp_ack(struct sock *sk, const struct sk_buff *skb, int flag) tcp_schedule_loss_probe(sk); delivered = tp->delivered - delivered; /* freshly ACKed or SACKed */ lost = tp->lost - lost; /* freshly marked lost */ - tcp_rate_gen(sk, delivered, lost, &sack_state.ack_time, - sack_state.rate); + tcp_rate_gen(sk, delivered, lost, sack_state.rate); tcp_cong_control(sk, ack, delivered, flag, sack_state.rate); tcp_xmit_recovery(sk, rexmit); return 1; |