summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorAl Viro2007-07-20 01:17:45 +0200
committerLinus Torvalds2007-07-20 01:29:55 +0200
commitc65c5131b349b08f3292b1cd10239cf376bfcb15 (patch)
treec5671adccfa9511bde2a5b7fb26bd1c2203df19b /net
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmo... (diff)
downloadkernel-qcow2-linux-c65c5131b349b08f3292b1cd10239cf376bfcb15.tar.gz
kernel-qcow2-linux-c65c5131b349b08f3292b1cd10239cf376bfcb15.tar.xz
kernel-qcow2-linux-c65c5131b349b08f3292b1cd10239cf376bfcb15.zip
missed cong_avoid() instance
Removal of rtt argument in ->cong_avoid() had missed tcp_htcp.c instance. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/tcp_htcp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_htcp.c b/net/ipv4/tcp_htcp.c
index 632c05a75883..08a02e6045c9 100644
--- a/net/ipv4/tcp_htcp.c
+++ b/net/ipv4/tcp_htcp.c
@@ -225,7 +225,7 @@ static u32 htcp_recalc_ssthresh(struct sock *sk)
return max((tp->snd_cwnd * ca->beta) >> 7, 2U);
}
-static void htcp_cong_avoid(struct sock *sk, u32 ack, s32 rtt,
+static void htcp_cong_avoid(struct sock *sk, u32 ack,
u32 in_flight, int data_acked)
{
struct tcp_sock *tp = tcp_sk(sk);