2003-02-04 09:08:35

by Helge Hafting

Subject: Re: 2.5.59-mm8 compile error in tcp_ipv6.c

mm8 gave me this error. mm6 didn't have this problem. _I haven't
looked at mm7.

gcc -Wp,-MD,net/ipv6/.tcp_ipv6.o.d -D__KERNEL__ -Iinclude -Wall
-Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common
-pipe -mpreferred-stack-boundary=2 -march=i686
-Iinclude/asm-i386/mach-default -fomit-frame-pointer -nostdinc
-iwithprefix include -DKBUILD_BASENAME=tcp_ipv6 -DKBUILD_MODNAME=ipv6
-c -o net/ipv6/tcp_ipv6.o net/ipv6/tcp_ipv6.c
net/ipv6/tcp_ipv6.c:1750: conflicting types for `tcp_v6_xmit'
net/ipv6/tcp_ipv6.c:63: previous declaration of `tcp_v6_xmit'
make[2]: *** [net/ipv6/tcp_ipv6.o] Error 1
make[1]: *** [net/ipv6] Error 2
make: *** [net] Error 2


Helge Hafting

2003-02-04 09:11:27

by Andrew Morton

Subject: Re: 2.5.59-mm8 compile error in tcp_ipv6.c

Helge Hafting <[email protected]> wrote:
>
> mm8 gave me this error. mm6 didn't have this problem. _I haven't
> looked at mm7.
>
> gcc -Wp,-MD,net/ipv6/.tcp_ipv6.o.d -D__KERNEL__ -Iinclude -Wall
> -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common
> -pipe -mpreferred-stack-boundary=2 -march=i686
> -Iinclude/asm-i386/mach-default -fomit-frame-pointer -nostdinc
> -iwithprefix include -DKBUILD_BASENAME=tcp_ipv6 -DKBUILD_MODNAME=ipv6
> -c -o net/ipv6/tcp_ipv6.o net/ipv6/tcp_ipv6.c
> net/ipv6/tcp_ipv6.c:1750: conflicting types for `tcp_v6_xmit'
> net/ipv6/tcp_ipv6.c:63: previous declaration of `tcp_v6_xmit'

Somebody's finger slipped.

diff -puN net/ipv6/tcp_ipv6.c~a net/ipv6/tcp_ipv6.c
--- 25/net/ipv6/tcp_ipv6.c~a 2003-02-04 01:20:17.000000000 -0800
+++ 25-akpm/net/ipv6/tcp_ipv6.c 2003-02-04 01:20:19.000000000 -0800
@@ -60,7 +60,7 @@ static void tcp_v6_send_check(struct soc
struct sk_buff *skb);

static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb);
-static int tcp_v6_xmit(struct sk_buff *skb);
+static int tcp_v6_xmit(struct sk_buff *skb, int ipfragok)

static struct tcp_func ipv6_mapped;
static struct tcp_func ipv6_specific;

_

2003-02-04 09:33:18

by David Miller

Subject: Re: 2.5.59-mm8 compile error in tcp_ipv6.c

From: Andrew Morton <[email protected]>
Date: Tue, 4 Feb 2003 01:21:05 -0800

Somebody's finger slipped.

Already in my tree, I'll push it to Linus.
Thanks.