PERFORCE change 153566 for review

[Marko Zec]

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

Change 153566 by zec at 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];