From owner-p4-projects@FreeBSD.ORG Sat May 8 22:54:52 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 82CA1106567A; Sat, 8 May 2010 22:54:52 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 471091065674 for ; Sat, 8 May 2010 22:54:52 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 350F18FC08 for ; Sat, 8 May 2010 22:54:52 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o48MsqGQ077588 for ; Sat, 8 May 2010 22:54:52 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o48MsqKa077586 for perforce@freebsd.org; Sat, 8 May 2010 22:54:52 GMT (envelope-from pgj@FreeBSD.org) Date: Sat, 8 May 2010 22:54:52 GMT Message-Id: <201005082254.o48MsqKa077586@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 177977 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 May 2010 22:54:52 -0000 http://p4web.freebsd.org/@@177977?ac=10 Change 177977 by pgj@csupor on 2010/05/08 22:54:06 Fix build of kernel. Affected files ... .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet6/icmp6.c#6 edit .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet6/ip6_mroute.c#8 edit .. //depot/projects/soc2009/pgj_libstat/src/sys/netipsec/ipsec.c#8 edit .. //depot/projects/soc2009/pgj_libstat/src/sys/netipsec/keysock.c#5 edit .. //depot/projects/soc2009/pgj_libstat/src/sys/netipsec/xform_ah.c#5 edit .. //depot/projects/soc2009/pgj_libstat/src/sys/netipsec/xform_esp.c#6 edit .. //depot/projects/soc2009/pgj_libstat/src/sys/netipsec/xform_ipcomp.c#6 edit .. //depot/projects/soc2009/pgj_libstat/src/sys/netipx/ipx_input.c#4 edit .. //depot/projects/soc2009/pgj_libstat/src/sys/netipx/spx_usrreq.c#5 edit Differences ... ==== //depot/projects/soc2009/pgj_libstat/src/sys/netinet6/icmp6.c#6 (text+ko) ==== @@ -90,6 +90,7 @@ #include #include #include +#include #include #include ==== //depot/projects/soc2009/pgj_libstat/src/sys/netinet6/ip6_mroute.c#8 (text+ko) ==== @@ -109,6 +109,7 @@ #include #include #include +#include #include #include ==== //depot/projects/soc2009/pgj_libstat/src/sys/netipsec/ipsec.c#8 (text+ko) ==== @@ -118,13 +118,11 @@ VNET_DEFINE(int, ip4_ipsec_ecn) = 0; VNET_DEFINE(int, ip4_esp_randpad) = -1; -struct stat_header ipsecstat_header = { +VNET_DEFINE(struct stat_header, ipsecstat_header) = { .sth_version = IPSECSTAT_VERSION, .sth_len = sizeof(struct ipsecstat) }; -VNET_DEFINE(struct stat_header, ipsecstat_header); - /* * Crypto support requirements: * ==== //depot/projects/soc2009/pgj_libstat/src/sys/netipsec/keysock.c#5 (text+ko) ==== @@ -75,13 +75,11 @@ static VNET_DEFINE(struct key_cb, key_cb); #define V_key_cb VNET(key_cb) -struct stat_header pfkeystat_header = { +VNET_DEFINE(struct stat_header, pfkeystat_header) = { .sth_version = PFKEYSTAT_VERSION, .sth_len = sizeof(struct pfkeystat) }; -VNET_DEFINE(struct stat_header, pfkeystat_header); - static struct sockaddr key_src = { 2, PF_KEY, }; static int key_sendup0 __P((struct rawcb *, struct mbuf *, int)); ==== //depot/projects/soc2009/pgj_libstat/src/sys/netipsec/xform_ah.c#5 (text+ko) ==== @@ -94,13 +94,11 @@ VNET_DEFINE(int, ah_cleartos) = 1; /* clear ip_tos when doing AH calc */ VNET_DEFINE(struct ahstat, ahstat); -struct stat_header ahstat_header = { +VNET_DEFINE(struct stat_header, ahstat_header) = { .sth_version = AHSTAT_VERSION, .sth_len = sizeof(struct ahstat) }; -VNET_DEFINE(struct stat_header, ahstat_header); - SYSCTL_DECL(_net_inet_ah); SYSCTL_VNET_INT(_net_inet_ah, OID_AUTO, ah_enable, CTLFLAG_RW, &VNET_NAME(ah_enable), 0, ""); ==== //depot/projects/soc2009/pgj_libstat/src/sys/netipsec/xform_esp.c#6 (text+ko) ==== @@ -81,13 +81,11 @@ VNET_DEFINE(int, esp_enable) = 1; VNET_DEFINE(struct espstat, espstat); -struct stat_header espstat_header = { +VNET_DEFINE(struct stat_header, espstat_header) = { .sth_version = ESPSTAT_VERSION, .sth_len = sizeof(struct espstat) }; -VNET_DEFINE(struct stat_header, espstat_header); - SYSCTL_DECL(_net_inet_esp); SYSCTL_VNET_INT(_net_inet_esp, OID_AUTO, esp_enable, CTLFLAG_RW, &VNET_NAME(esp_enable), 0, ""); ==== //depot/projects/soc2009/pgj_libstat/src/sys/netipsec/xform_ipcomp.c#6 (text+ko) ==== @@ -47,10 +47,10 @@ #include #include #include -#include #include #include +#include #include #include @@ -73,13 +73,11 @@ VNET_DEFINE(int, ipcomp_enable) = 1; VNET_DEFINE(struct ipcompstat, ipcompstat); -struct stat_header ipcompstat_header = { +VNET_DEFINE(struct stat_header, ipcompstat_header) = { .sth_version = IPCOMPSTAT_VERSION, .sth_len = sizeof(struct ipcompstat) }; -VNET_DEFINE(struct stat_header, ipcompstat_header); - SYSCTL_DECL(_net_inet_ipcomp); SYSCTL_VNET_INT(_net_inet_ipcomp, OID_AUTO, @@ -628,8 +626,6 @@ static void vnet_ipcomp_attach(const void *unused __unused) { - - V_ipcompstat_header.sth_version = IPCOMPSTAT_VERSION; } VNET_SYSINIT(vnet_ipcomp_xform_init, SI_SUB_PROTO_DOMAIN, SI_ORDER_MIDDLE, ==== //depot/projects/soc2009/pgj_libstat/src/sys/netipx/ipx_input.c#4 (text+ko) ==== @@ -80,8 +80,7 @@ #include #include #include - -#include +#include #include #include ==== //depot/projects/soc2009/pgj_libstat/src/sys/netipx/spx_usrreq.c#5 (text+ko) ==== @@ -83,8 +83,9 @@ #include #include +#include + #include -#include #include #include