From owner-p4-projects@FreeBSD.ORG  Wed Nov 26 01:21:32 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B61B41065673; Wed, 26 Nov 2008 01:21:32 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7A597106564A
	for <perforce@freebsd.org>; Wed, 26 Nov 2008 01:21:32 +0000 (UTC)
	(envelope-from zec@tel.fer.hr)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 6C6138FC13
	for <perforce@freebsd.org>; Wed, 26 Nov 2008 01:21:32 +0000 (UTC)
	(envelope-from zec@tel.fer.hr)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAQ1LWvr070753
	for <perforce@freebsd.org>; Wed, 26 Nov 2008 01:21:32 GMT
	(envelope-from zec@tel.fer.hr)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAQ1LWIF070751
	for perforce@freebsd.org; Wed, 26 Nov 2008 01:21:32 GMT
	(envelope-from zec@tel.fer.hr)
Date: Wed, 26 Nov 2008 01:21:32 GMT
Message-Id: <200811260121.mAQ1LWIF070751@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@tel.fer.hr using -f
From: Marko Zec <zec@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 153566 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Wed, 26 Nov 2008 01:21:33 -0000

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

Change 153566 by zec@zec_tpx32 on 2008/11/26 01:20:55

	Revert change 153564 - key_src is never written to so
	it doesn't make any sense to virtualize / replicate it.
	
	Pointed out by:	julian

Affected files ...

.. //depot/projects/vimage-commit2/src/sys/netipsec/keysock.c#15 edit
.. //depot/projects/vimage-commit2/src/sys/netipsec/vipsec.h#10 edit

Differences ...

==== //depot/projects/vimage-commit2/src/sys/netipsec/keysock.c#15 (text+ko) ====

@@ -74,9 +74,10 @@
 #ifdef VIMAGE_GLOBALS
 static struct key_cb key_cb;
 struct pfkeystat pfkeystat;
-static struct sockaddr key_src;
 #endif
 
+static struct sockaddr key_src = { 2, PF_KEY };
+
 static int key_sendup0 __P((struct rawcb *, struct mbuf *, int));
 
 /*
@@ -572,9 +573,6 @@
 {
 	INIT_VNET_IPSEC(curvnet);
 
-	V_key_src.sa_len = 2;
-	V_key_src.sa_family = PF_KEY;
-
 	bzero((caddr_t)&V_key_cb, sizeof(V_key_cb));
 	ipsec_init();
 	key_init();

==== //depot/projects/vimage-commit2/src/sys/netipsec/vipsec.h#10 (text+ko) ====

@@ -106,7 +106,6 @@
 
 	struct pfkeystat	_pfkeystat;
 	struct key_cb		_key_cb;
-	struct sockaddr		_key_src;
 	LIST_HEAD(, secpolicy)	_sptree[IPSEC_DIR_MAX];
 	LIST_HEAD(, secashead)	_sahtree;
 	LIST_HEAD(, secreg)	_regtree[SADB_SATYPE_MAX + 1];