From owner-freebsd-commit  Thu Sep 21 23:14:16 1995
Return-Path: owner-commit
Received: (from root@localhost)
          by freefall.freebsd.org (8.6.12/8.6.6) id XAA16650
          for freebsd-commit-outgoing; Thu, 21 Sep 1995 23:14:16 -0700
Received: (from root@localhost)
          by freefall.freebsd.org (8.6.12/8.6.6) id XAA16636
          for cvs-all-outgoing; Thu, 21 Sep 1995 23:14:09 -0700
Received: (from root@localhost)
          by freefall.freebsd.org (8.6.12/8.6.6) id XAA16626
          for cvs-sys-outgoing; Thu, 21 Sep 1995 23:14:07 -0700
Received: from Root.COM (implode.Root.COM [198.145.90.17])
          by freefall.freebsd.org (8.6.12/8.6.6) with ESMTP id XAA16620
          ; Thu, 21 Sep 1995 23:14:02 -0700
Received: from corbin.Root.COM (corbin [198.145.90.34]) by Root.COM (8.6.12/8.6.5) with ESMTP id XAA01311; Thu, 21 Sep 1995 23:12:42 -0700
Received: from localhost (localhost [127.0.0.1]) by corbin.Root.COM (8.6.12/8.6.5) with SMTP id XAA00473; Thu, 21 Sep 1995 23:15:09 -0700
Message-Id: <199509220615.XAA00473@corbin.Root.COM>
To: Peter Wemm <peter@jhome.dialix.com>
cc: "Garrett A. Wollman" <wollman@freefall.freebsd.org>,
        CVS-commiters@freefall.freebsd.org, cvs-sys@freefall.freebsd.org
Subject: Re: cvs commit: src/sys/netinet tcp_var.h 
In-reply-to: Your message of "Fri, 22 Sep 95 14:10:51 +0800."
             <Pine.BSF.3.91.950922140856.2515I-100000@jhome.DIALix.COM> 
From: David Greenman <davidg@Root.COM>
Reply-To: davidg@Root.COM
Date: Thu, 21 Sep 1995 23:15:04 -0700
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..

   Right, I added the fix a few months back. Sigh.

-DG