From owner-p4-projects@FreeBSD.ORG  Sun Nov 28 11:08:47 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5BEFB16A4D0; Sun, 28 Nov 2004 11:08:47 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 18F7216A4CE
	for <perforce@freebsd.org>; Sun, 28 Nov 2004 11:08:47 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id EE94343D5C
	for <perforce@freebsd.org>; Sun, 28 Nov 2004 11:08:46 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iASB8kgY098233
	for <perforce@freebsd.org>; Sun, 28 Nov 2004 11:08:46 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iASB8kOU098230
	for perforce@freebsd.org; Sun, 28 Nov 2004 11:08:46 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 28 Nov 2004 11:08:46 GMT
Message-Id: <200411281108.iASB8kOU098230@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 65975 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 28 Nov 2004 11:08:48 -0000

http://perforce.freebsd.org/chv.cgi?CH=65975

Change 65975 by rwatson@rwatson_paprika on 2004/11/28 11:08:38

	Remove IPSEC code fragment possibly merged in error from
	netperf+sockets.

Affected files ...

.. //depot/projects/netperf_socket/sys/netinet/ip_output.c#22 edit

Differences ...

==== //depot/projects/netperf_socket/sys/netinet/ip_output.c#22 (text+ko) ====

@@ -145,12 +145,6 @@
 
 	M_ASSERTPKTHDR(m);
 	
-#ifdef IPSEC
-	/* XXXRW: so is not defined -- merge error from netperf+sockets? */
-	so = ipsec_getsocket(m);
-	(void)ipsec_setsocket(m, NULL);
-#endif /*IPSEC*/
-
 	if (ro == NULL) {
 		ro = &iproute;
 		bzero(ro, sizeof (*ro));