From owner-freebsd-commit Thu Sep 21 23:12:01 1995 Return-Path: owner-commit Received: (from root@localhost) by freefall.freebsd.org (8.6.12/8.6.6) id XAA16578 for freebsd-commit-outgoing; Thu, 21 Sep 1995 23:12:01 -0700 Received: (from root@localhost) by freefall.freebsd.org (8.6.12/8.6.6) id XAA16564 for cvs-all-outgoing; Thu, 21 Sep 1995 23:11:53 -0700 Received: (from root@localhost) by freefall.freebsd.org (8.6.12/8.6.6) id XAA16554 for cvs-sys-outgoing; Thu, 21 Sep 1995 23:11:52 -0700 Received: from jhome.DIALix.COM (root@jhome.DIALix.COM [192.203.228.69]) by freefall.freebsd.org (8.6.12/8.6.6) with ESMTP id XAA16536 ; Thu, 21 Sep 1995 23:11:12 -0700 Received: (from peter@localhost) by jhome.DIALix.COM (8.6.12/8.6.9) id OAA09737; Fri, 22 Sep 1995 14:10:52 +0800 Date: Fri, 22 Sep 1995 14:10:51 +0800 (WST) From: Peter Wemm To: "Garrett A. Wollman" cc: CVS-commiters@freefall.freebsd.org, cvs-sys@freefall.freebsd.org Subject: Re: cvs commit: src/sys/netinet tcp_var.h In-Reply-To: <199509211729.KAA21735@freefall.freebsd.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-commit@FreeBSD.org Precedence: bulk On Thu, 21 Sep 1995, Garrett A. Wollman wrote: > wollman 95/09/21 10:29:14 > > Modified: sys/netinet tcp_var.h > Log: > Merge with 4.4-Lite-2. This just adds a couple of tcpstat entries which > we don't currently set, but might in the future. Umm... You've broken it.. :-) cc -c -O -W -Wreturn-type -Wcomment -Wredundant-decls -Wimplicit -Wnested-externs -nostdinc -I. -I../.. -I../../sys -I../../../include -DJHOME -DI586_CPU -DI486_CPU -DI386_CPU -DSCSI_REPORT_GEOMETRY -DNULLFS -DKERNFS -DFDESC -DMFS -DCD9660 -DMSDOSFS -DP ROCFS -DNFS -DFFS -DMROUTING -DGATEWAY -DDIAGNOSTIC -DKTRACE -DDDB -DSYSVMSG -DSYSVSEM -DSYSVSHM -DOPEN_MAX=128 -DCHILD_MAX=128 -DMAXCONS=16 -DUCONSOLE -DBOUNCE_BUFFERS -DCOMPAT_LINUX -DCOMPAT_43 -DINET -DMATH_EMULATE -DKERNEL -Di386 -DLOAD_ADDRESS=0xF010 0000 ../../netinet/in_proto.c In file included from ../../netinet/in_proto.c:60: ../../netinet/tcp_var.h:289: duplicate member `tcps_persistdrop' *** Error code 1 Stop. There are two "tcps_persistdrop" entries in the structure... I think David added the bugfix to timeout the stuck sockets before... It might be an idea to check to see if it's not duplicated.. Cheers, -Peter