diff options
Diffstat (limited to 'net/ipv4/tcp_input.c')
-rw-r--r-- | net/ipv4/tcp_input.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 63095b218b4a..c53b7f35c51d 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c | |||
@@ -2934,10 +2934,10 @@ static void tcp_synack_rtt_meas(struct sock *sk, const u32 synack_stamp) | |||
2934 | tcp_ack_update_rtt(sk, FLAG_SYN_ACKED, seq_rtt, -1); | 2934 | tcp_ack_update_rtt(sk, FLAG_SYN_ACKED, seq_rtt, -1); |
2935 | } | 2935 | } |
2936 | 2936 | ||
2937 | static void tcp_cong_avoid(struct sock *sk, u32 ack, u32 in_flight) | 2937 | static void tcp_cong_avoid(struct sock *sk, u32 ack, u32 acked, u32 in_flight) |
2938 | { | 2938 | { |
2939 | const struct inet_connection_sock *icsk = inet_csk(sk); | 2939 | const struct inet_connection_sock *icsk = inet_csk(sk); |
2940 | icsk->icsk_ca_ops->cong_avoid(sk, ack, in_flight); | 2940 | icsk->icsk_ca_ops->cong_avoid(sk, ack, acked, in_flight); |
2941 | tcp_sk(sk)->snd_cwnd_stamp = tcp_time_stamp; | 2941 | tcp_sk(sk)->snd_cwnd_stamp = tcp_time_stamp; |
2942 | } | 2942 | } |
2943 | 2943 | ||
@@ -3454,7 +3454,7 @@ static int tcp_ack(struct sock *sk, const struct sk_buff *skb, int flag) | |||
3454 | 3454 | ||
3455 | /* Advance cwnd if state allows */ | 3455 | /* Advance cwnd if state allows */ |
3456 | if (tcp_may_raise_cwnd(sk, flag)) | 3456 | if (tcp_may_raise_cwnd(sk, flag)) |
3457 | tcp_cong_avoid(sk, ack, prior_in_flight); | 3457 | tcp_cong_avoid(sk, ack, acked, prior_in_flight); |
3458 | 3458 | ||
3459 | if (tcp_ack_is_dubious(sk, flag)) { | 3459 | if (tcp_ack_is_dubious(sk, flag)) { |
3460 | is_dupack = !(flag & (FLAG_SND_UNA_ADVANCED | FLAG_NOT_DUP)); | 3460 | is_dupack = !(flag & (FLAG_SND_UNA_ADVANCED | FLAG_NOT_DUP)); |