Re: Linux 2.4.27-pre4

[YOSHIFUJI Hideaki / 吉藤英明 <yoshfuji@xxxxxxxxxxxxxx>]

In article <40BAA82A.4040105@xxxxxxxxxxxx> (at Sun, 30 May 2004 22:36:10 
-0500), Bryan Andersen <bryan@xxxxxxxxxxxx> says:

> Error in ipv4 net code, config attached.
> 
> gcc-3.2 -D__KERNEL__ -I/usr/src/linux-2.4.27-pre4/include -Wall 
> -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common 
> -fomit-frame-pointer -pipe -mpreferred-stack-boundary=2 -march=athlon
> -nostdinc -iwithprefix include -DKBUILD_BASENAME=tcp_input  -c -o 
> tcp_input.o tcp_input.c
> tcp_input.c: In function `tcp_rcv_space_adjust':
> tcp_input.c:479: structure has no member named `sk_rcvbuf'
> tcp_input.c:480: structure has no member named `sk_rcvbuf'

Thanks. Patch is available. Please try this patch.

--yoshfuji

--- Begin Message ---

To:	marcelo.tosatti@xxxxxxxxxxxx
Subject:	[PATCH][2.4.27-pre4] tcp_input.c compile-time error
From:	Mikael Pettersson <mikpe@xxxxxxxxx>
Date:	Sun, 30 May 2004 23:54:50 +0200 (MEST)
Cc:	davem@xxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx, netdev@xxxxxxxxxxx
Delivered-to:	yoshfuji@xxxxxxxxxxxxxxxxx
Delivered-to:	yoshfuji@xxxxxxxxxxxxxxxxxxxxxx
Sender:	netdev-bounce@xxxxxxxxxxx

net/ipv4/tcp_input.c in 2.4.27-pre4 fails to compile:

tcp_input.c: In function `tcp_rcv_space_adjust':
tcp_input.c:479: error: structure has no member named `sk_rcvbuf'
tcp_input.c:480: error: structure has no member named `sk_rcvbuf'
make[3]: *** [tcp_input.o] Error 1

The patch below appears to fix this problem, although some netdev
person should probably check it.

/Mikael

diff -ruN linux-2.4.27-pre4/net/ipv4/tcp_input.c 
linux-2.4.27-pre4.tcp_input-fix/net/ipv4/tcp_input.c
--- linux-2.4.27-pre4/net/ipv4/tcp_input.c      2004-05-30 23:18:16.000000000 
+0200
+++ linux-2.4.27-pre4.tcp_input-fix/net/ipv4/tcp_input.c        2004-05-30 
23:45:52.000000000 +0200
@@ -476,8 +476,8 @@
                                  16 + sizeof(struct sk_buff));
                        space *= rcvmem;
                        space = min(space, sysctl_tcp_rmem[2]);
-                       if (space > sk->sk_rcvbuf)
-                               sk->sk_rcvbuf = space;
+                       if (space > sk->rcvbuf)
+                               sk->rcvbuf = space;
                }
        }
        

--- End Message ---