Helge Hafting <helgehaf@aitel.hist.no> 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;
_
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Fri Feb 07 2003 - 22:00:14 EST