aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/tcp_input.c
diff options
context:
space:
mode:
authorIlpo Järvinen <ilpo.jarvinen@helsinki.fi>2007-12-01 17:47:59 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 17:55:41 -0500
commitc3a05c6050a339c92e49fae0ba77dbba0d41fd99 (patch)
tree4bc4e003d522cc748aceb7478f86c043e382ad8e /net/ipv4/tcp_input.c
parentede9f3b186bc3eb0fce084bdcab500efc3721a80 (diff)
[TCP]: Cong.ctrl modules: remove unused good_ack from cong_avoid
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> 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 d313dea361a6..cb441188870c 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -2710,11 +2710,10 @@ static inline void tcp_ack_update_rtt(struct sock *sk, const int flag,
2710 tcp_ack_no_tstamp(sk, seq_rtt, flag); 2710 tcp_ack_no_tstamp(sk, seq_rtt, flag);
2711} 2711}
2712 2712
2713static void tcp_cong_avoid(struct sock *sk, u32 ack, 2713static void tcp_cong_avoid(struct sock *sk, u32 ack, u32 in_flight)
2714 u32 in_flight, int good)
2715{ 2714{
2716 const struct inet_connection_sock *icsk = inet_csk(sk); 2715 const struct inet_connection_sock *icsk = inet_csk(sk);
2717 icsk->icsk_ca_ops->cong_avoid(sk, ack, in_flight, good); 2716 icsk->icsk_ca_ops->cong_avoid(sk, ack, in_flight);
2718 tcp_sk(sk)->snd_cwnd_stamp = tcp_time_stamp; 2717 tcp_sk(sk)->snd_cwnd_stamp = tcp_time_stamp;
2719} 2718}
2720 2719
@@ -3238,11 +3237,11 @@ static int tcp_ack(struct sock *sk, struct sk_buff *skb, int flag)
3238 /* Advance CWND, if state allows this. */ 3237 /* Advance CWND, if state allows this. */
3239 if ((flag & FLAG_DATA_ACKED) && !frto_cwnd && 3238 if ((flag & FLAG_DATA_ACKED) && !frto_cwnd &&
3240 tcp_may_raise_cwnd(sk, flag)) 3239 tcp_may_raise_cwnd(sk, flag))
3241 tcp_cong_avoid(sk, ack, prior_in_flight, 0); 3240 tcp_cong_avoid(sk, ack, prior_in_flight);
3242 tcp_fastretrans_alert(sk, prior_packets - tp->packets_out, flag); 3241 tcp_fastretrans_alert(sk, prior_packets - tp->packets_out, flag);
3243 } else { 3242 } else {
3244 if ((flag & FLAG_DATA_ACKED) && !frto_cwnd) 3243 if ((flag & FLAG_DATA_ACKED) && !frto_cwnd)
3245 tcp_cong_avoid(sk, ack, prior_in_flight, 1); 3244 tcp_cong_avoid(sk, ack, prior_in_flight);
3246 } 3245 }
3247 3246
3248 if ((flag & FLAG_FORWARD_PROGRESS) || !(flag&FLAG_NOT_DUP)) 3247 if ((flag & FLAG_FORWARD_PROGRESS) || !(flag&FLAG_NOT_DUP))