From owner-cvs-all Tue Sep 3 15:32:55 2002 Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5214F37B400; Tue, 3 Sep 2002 15:32:51 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0399043E4A; Tue, 3 Sep 2002 15:32:51 -0700 (PDT) (envelope-from jmallett@FreeBSD.org) Received: from freefall.freebsd.org (jmallett@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g83MWoJU009074; Tue, 3 Sep 2002 15:32:50 -0700 (PDT) (envelope-from jmallett@freefall.freebsd.org) Received: (from jmallett@localhost) by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g83MWobq009073; Tue, 3 Sep 2002 15:32:50 -0700 (PDT) Message-Id: <200209032232.g83MWobq009073@freefall.freebsd.org> From: Juli Mallett Date: Tue, 3 Sep 2002 15:32:50 -0700 (PDT) To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/sys/netinet tcp_input.c X-FreeBSD-CVS-Branch: RELENG_4 Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG jmallett 2002/09/03 15:32:50 PDT Modified files: (Branch: RELENG_4) sys/netinet tcp_input.c Log: CVS wasn't at fault for this part of the mismerge, gratuitous differences between CURRENT and STABLE were: isipv6 isn't existant in the non-INET6 case, so conditionalise large parts on this. Yuck. Yuck. Submitted by: lioux Approbed by: re (original commit) Revision Changes Path 1.107.2.30 +5 -3 src/sys/netinet/tcp_input.c To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message