PERFORCE change 160606 for review

[Marko Zec]

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

Change 160606 by zec at zec_amdx2 on 2009/04/14 11:20:41

	Unbreak LINT.

Affected files ...

.. //depot/projects/vimage/src/sys/netipsec/ipsec.c#43 edit
.. //depot/projects/vimage/src/sys/netipsec/xform_ah.c#26 edit
.. //depot/projects/vimage/src/sys/netipsec/xform_esp.c#25 edit
.. //depot/projects/vimage/src/sys/netipsec/xform_ipcomp.c#21 edit
.. //depot/projects/vimage/src/sys/netipsec/xform_ipip.c#29 edit

Differences ...

==== //depot/projects/vimage/src/sys/netipsec/ipsec.c#43 (text+ko) ====

@@ -233,9 +233,6 @@
 	"IPsec IPv6 statistics.");
 #endif /* INET6 */
 
-VNET_MOD_DECLARE(IPSEC, ipsec, vnet_ipsec_iattach, vnet_ipsec_idetach,
-    INET, NULL)
-
 static int ipsec_setspidx_inpcb __P((struct mbuf *, struct inpcb *));
 static int ipsec_setspidx __P((struct mbuf *, struct secpolicyindex *, int));
 static void ipsec4_get_ulp __P((struct mbuf *m, struct secpolicyindex *, int));
@@ -255,7 +252,10 @@
 	.vmi_id		= VNET_MOD_IPSEC,
 	.vmi_name	= "ipsec",
 	.vmi_dependson	= VNET_MOD_INET,	/* XXX revisit - INET6 ? */
-	.vmi_iattach	= ipsec_iattach
+	.vmi_iattach	= ipsec_iattach,
+#ifdef VIMAGE
+	.vmi_idetach	= ipsec_idetach
+#endif
 };
 #endif /* !VIMAGE_GLOBALS */
 

==== //depot/projects/vimage/src/sys/netipsec/xform_ah.c#26 (text+ko) ====

@@ -113,10 +113,6 @@
 SYSCTL_V_STRUCT(V_NET, vnet_ipsec, _net_inet_ah, IPSECCTL_STATS,
 	stats,		CTLFLAG_RD,	ahstat,	ahstat, "");
 
-static int ah_iattach(const void *);
-
-VNET_MOD_DECLARE_STATELESS(AH, ah, ah_iattach, NULL, IPSEC)
-
 static unsigned char ipseczeroes[256];	/* larger than an ip6 extension hdr */
 
 static int ah_input_cb(struct cryptop*);
@@ -1231,18 +1227,6 @@
 	ah_init,	ah_zeroize,	ah_input,	ah_output,
 };
 
-static int
-ah_iattach(unused)
-	const void *unused;
-{
-	INIT_VNET_IPSEC(curvnet);
-
-	V_ah_enable = 1;          /* control flow of packets with AH */
-	V_ah_cleartos = 1;        /* clear ip_tos when doing AH calc */
-
-	return 0;
-}
-
 static void
 ah_attach(void)
 {

==== //depot/projects/vimage/src/sys/netipsec/xform_esp.c#25 (text+ko) ====

@@ -999,19 +999,6 @@
 };
 
 static int
-esp_iattach(unused)
-	const void *unused;
-{
-
-	xform_register(&esp_xformsw);
-#ifndef VIMAGE_GLOBALS
-	vnet_mod_register(&vnet_esp_modinfo);
-#else
-	esp_iattach(NULL);
-#endif
-}
-
-static int
 esp_iattach(const void *unused __unused)
 {
 	INIT_VNET_IPSEC(curvnet);

==== //depot/projects/vimage/src/sys/netipsec/xform_ipcomp.c#21 (text+ko) ====

@@ -78,10 +78,6 @@
 SYSCTL_V_STRUCT(V_NET, vnet_ipsec, _net_inet_ipcomp, IPSECCTL_STATS,
 	stats,		CTLFLAG_RD,	ipcompstat,	ipcompstat, "");
 
-static int ipcomp_iattach(const void *);
-
-VNET_MOD_DECLARE_STATELESS(IPCOMP, ipcomp, ipcomp_iattach, NULL, IPSEC)
-
 static int ipcomp_input_cb(struct cryptop *crp);
 static int ipcomp_output_cb(struct cryptop *crp);
 static int ipcomp_iattach(const void *);
@@ -610,17 +606,6 @@
 	ipcomp_output
 };
 
-static int
-ipcomp_iattach(unused)
-	const void *unused;
-{
-	INIT_VNET_IPSEC(curvnet);
-
-	V_ipcomp_enable = 0;
-
-	return 0;
-}
-
 static void
 ipcomp_attach(void)
 {

==== //depot/projects/vimage/src/sys/netipsec/xform_ipip.c#29 (text+ko) ====

@@ -119,10 +119,6 @@
 };
 #endif /* !VIMAGE_GLOBALS */
 
-static int ipip_iattach(const void *);
-
-VNET_MOD_DECLARE_STATELESS(IPIP, ipip, ipip_iattach, NULL, IPSEC)
-
 #ifdef INET6
 /*
  * Really only a wrapper for ipip_input(), for use with IPv6.