diff options
author | Stephen Hemminger <shemminger@linux-foundation.org> | 2007-07-16 21:35:52 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-07-18 04:46:58 -0400 |
commit | 16751347a060a10c09b11593bb179fd5b0240c04 (patch) | |
tree | 40399ba217d9e4c45060c4d12334c53f931ca635 /net/ipv4/tcp_input.c | |
parent | 44beac008631d1b8a52f103e04eacba2bda81511 (diff) |
[TCP]: remove unused argument to cong_avoid op
None of the existing TCP congestion controls use the rtt value pased
in the ca_ops->cong_avoid interface. Which is lucky because seq_rtt
could have been -1 when handling a duplicate ack.
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
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 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 4e5884ac8f29..fec8a7a4dbaf 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c | |||
@@ -2323,11 +2323,11 @@ static inline void tcp_ack_update_rtt(struct sock *sk, const int flag, | |||
2323 | tcp_ack_no_tstamp(sk, seq_rtt, flag); | 2323 | tcp_ack_no_tstamp(sk, seq_rtt, flag); |
2324 | } | 2324 | } |
2325 | 2325 | ||
2326 | static void tcp_cong_avoid(struct sock *sk, u32 ack, u32 rtt, | 2326 | static void tcp_cong_avoid(struct sock *sk, u32 ack, |
2327 | u32 in_flight, int good) | 2327 | u32 in_flight, int good) |
2328 | { | 2328 | { |
2329 | const struct inet_connection_sock *icsk = inet_csk(sk); | 2329 | const struct inet_connection_sock *icsk = inet_csk(sk); |
2330 | icsk->icsk_ca_ops->cong_avoid(sk, ack, rtt, in_flight, good); | 2330 | icsk->icsk_ca_ops->cong_avoid(sk, ack, in_flight, good); |
2331 | tcp_sk(sk)->snd_cwnd_stamp = tcp_time_stamp; | 2331 | tcp_sk(sk)->snd_cwnd_stamp = tcp_time_stamp; |
2332 | } | 2332 | } |
2333 | 2333 | ||
@@ -2826,11 +2826,11 @@ static int tcp_ack(struct sock *sk, struct sk_buff *skb, int flag) | |||
2826 | /* Advance CWND, if state allows this. */ | 2826 | /* Advance CWND, if state allows this. */ |
2827 | if ((flag & FLAG_DATA_ACKED) && !frto_cwnd && | 2827 | if ((flag & FLAG_DATA_ACKED) && !frto_cwnd && |
2828 | tcp_may_raise_cwnd(sk, flag)) | 2828 | tcp_may_raise_cwnd(sk, flag)) |
2829 | tcp_cong_avoid(sk, ack, seq_rtt, prior_in_flight, 0); | 2829 | tcp_cong_avoid(sk, ack, prior_in_flight, 0); |
2830 | tcp_fastretrans_alert(sk, prior_snd_una, prior_packets, flag); | 2830 | tcp_fastretrans_alert(sk, prior_snd_una, prior_packets, flag); |
2831 | } else { | 2831 | } else { |
2832 | if ((flag & FLAG_DATA_ACKED) && !frto_cwnd) | 2832 | if ((flag & FLAG_DATA_ACKED) && !frto_cwnd) |
2833 | tcp_cong_avoid(sk, ack, seq_rtt, prior_in_flight, 1); | 2833 | tcp_cong_avoid(sk, ack, prior_in_flight, 1); |
2834 | } | 2834 | } |
2835 | 2835 | ||
2836 | if ((flag & FLAG_FORWARD_PROGRESS) || !(flag&FLAG_NOT_DUP)) | 2836 | if ((flag & FLAG_FORWARD_PROGRESS) || !(flag&FLAG_NOT_DUP)) |