Breakage in net/ipv4/tcp_vegas.c

Breakage in net/ipv4/tcp_vegas.c

[Horst von Brand]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 452 bytes --]

  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

Re: Breakage in net/ipv4/tcp_vegas.c

[Ian McDonald]

On 11/12/05, Horst von Brand <vonbrand@inf.utfsm.cl> 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 <jgarzik@pobox.com>

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

Re: Breakage in net/ipv4/tcp_vegas.c

[David S. Miller]

From: Ian McDonald <imcdnzl@gmail.com>
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.