From owner-p4-projects@FreeBSD.ORG Tue Apr 14 11:21:27 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9A6DB1065679; Tue, 14 Apr 2009 11:21:27 +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 535801065674 for ; Tue, 14 Apr 2009 11:21:27 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 415718FC1A for ; Tue, 14 Apr 2009 11:21:27 +0000 (UTC) (envelope-from zec@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 n3EBLRp7052712 for ; Tue, 14 Apr 2009 11:21:27 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n3EBLQsT052710 for perforce@freebsd.org; Tue, 14 Apr 2009 11:21:26 GMT (envelope-from zec@fer.hr) Date: Tue, 14 Apr 2009 11:21:26 GMT Message-Id: <200904141121.n3EBLQsT052710@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 160606 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Apr 2009 11:21:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=160606 Change 160606 by zec@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.