2005-11-12 12:24:36

by Horst H. von Brand

Subject: Breakage in net/ipv4/tcp_vegas.c

CC [M] net/ipv4/tcp_vegas.o
net/ipv4/tcp_vegas.c: In function ‘tcp_vegas_cong_avoid’:
net/ipv4/tcp_vegas.c:239: error: ‘cnt’ undeclared (first use in this function)
--
Dr. Horst H. von Brand User #22616 counter.li.org
Departamento de Informatica Fono: +56 32 654431
Universidad Tecnica Federico Santa Maria +56 32 654239
Casilla 110-V, Valparaiso, Chile Fax: +56 32 797513

2005-11-12 18:35:26

by Ian McDonald

Subject: Re: Breakage in net/ipv4/tcp_vegas.c

On 11/12/05, Horst von Brand <[email protected]> wrote:
> CC [M] net/ipv4/tcp_vegas.o
> net/ipv4/tcp_vegas.c: In function 'tcp_vegas_cong_avoid':
> net/ipv4/tcp_vegas.c:239: error: 'cnt' undeclared (first use in this function)

This has been fixed in the networking tree which I imagine Linus will
merge again soon but here is the fix before then:
Recent TCP changes broke the build.

Signed-off-by: Jeff Garzik <[email protected]>

diff --git a/net/ipv4/tcp_vegas.c b/net/ipv4/tcp_vegas.c
index 4376814..b7d296a 100644
--- a/net/ipv4/tcp_vegas.c
+++ b/net/ipv4/tcp_vegas.c
@@ -236,7 +236,7 @@ static void tcp_vegas_cong_avoid(struct
/* We don't have enough RTT samples to do the Vegas
* calculation, so we'll behave like Reno.
*/
- tcp_reno_cong_avoid(sk, ack, seq_rtt, in_flight, cnt);
+ tcp_reno_cong_avoid(sk, ack, seq_rtt, in_flight, flag);
} else {
u32 rtt, target_cwnd, diff;

--
Ian McDonald
http://wand.net.nz/~iam4
WAND Network Research Group
University of Waikato
New Zealand

2005-11-12 19:43:28

by David Miller

Subject: Re: Breakage in net/ipv4/tcp_vegas.c

From: Ian McDonald <[email protected]>
Date: Sun, 13 Nov 2005 07:35:23 +1300

> This has been fixed in the networking tree which I imagine Linus will
> merge again soon but here is the fix before then:
> Recent TCP changes broke the build.

The fix is in Linus's GIT tree and made it into 2.6.15-rc1
as well.