From owner-cvs-src-old@FreeBSD.ORG Thu May 6 06:45:17 2010 Return-Path: Delivered-To: cvs-src-old@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4330A1065670 for ; Thu, 6 May 2010 06:45:17 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2D9038FC12 for ; Thu, 6 May 2010 06:45:17 +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 o466jGvb056166 for ; Thu, 6 May 2010 06:45:16 GMT (envelope-from bz@repoman.freebsd.org) Received: (from svn2cvs@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o466jGEa056165 for cvs-src-old@freebsd.org; Thu, 6 May 2010 06:45:16 GMT (envelope-from bz@repoman.freebsd.org) Message-Id: <201005060645.o466jGEa056165@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to bz@repoman.freebsd.org using -f From: "Bjoern A. Zeeb" Date: Thu, 6 May 2010 06:44:19 +0000 (UTC) To: cvs-src-old@freebsd.org X-FreeBSD-CVS-Branch: RELENG_8 Subject: cvs commit: src/sys/contrib/ipfilter/netinet ip_auth.c src/sys/net if.c if_gif.c if_gif.h route.c src/sys/netinet icmp6.h if_ether.c in.c in_gif.c in_proto.c in_rmx.c ip_icmp.c ip_icmp.h ip_input.c ip_var.h tcp_hostcache.c tcp_input.c tcp_output.c tcp_reass.c ... X-BeenThere: cvs-src-old@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: **OBSOLETE** CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 May 2010 06:45:17 -0000 bz 2010-05-06 06:44:19 UTC FreeBSD src repository Modified files: (Branch: RELENG_8) sys/contrib/ipfilter/netinet ip_auth.c sys/net if.c if_gif.c if_gif.h route.c sys/netinet icmp6.h if_ether.c in.c in_gif.c in_proto.c in_rmx.c ip_icmp.c ip_icmp.h ip_input.c ip_var.h tcp_hostcache.c tcp_input.c tcp_output.c tcp_reass.c tcp_sack.c tcp_subr.c tcp_syncache.c tcp_timewait.c tcp_var.h udp_usrreq.c udp_var.h sys/netinet6 frag6.c icmp6.c in6_gif.c in6_ifattach.c in6_proto.c in6_rmx.c in6_src.c in6_var.h ip6_input.c ip6_mroute.c ip6_var.h nd6.c nd6.h nd6_nbr.c nd6_rtr.c raw_ip6.c scope6.c sys/netipsec ah_var.h esp_var.h ipcomp_var.h ipip_var.h ipsec.c ipsec.h ipsec6.h key.c xform_esp.c Log: SVN rev 207695 on 2010-05-06 06:44:19Z by bz MFC r207369: MFP4: @176978-176982, 176984, 176990-176994, 177441 "Whitspace" churn after the VIMAGE/VNET whirls. Remove the need for some "init" functions within the network stack, like pim6_init(), icmp_init() or significantly shorten others like ip6_init() and nd6_init(), using static initialization again where possible and formerly missed. Move (most) variables back to the place they used to be before the container structs and VIMAGE_GLOABLS (before r185088) and try to reduce the diff to stable/7 and earlier as good as possible, to help out-of-tree consumers to update from 6.x or 7.x to 8 or 9. This also removes some header file pollution for putatively static global variables. Revert VIMAGE specific changes in ipfilter::ip_auth.c, that are no longer needed. Reviewed by: jhb Discussed with: rwatson Sponsored by: The FreeBSD Foundation Sponsored by: CK Software GmbH Revision Changes Path 1.48.2.2 +0 -5 src/sys/contrib/ipfilter/netinet/ip_auth.c 1.359.2.20 +3 -3 src/sys/net/if.c 1.88.2.2 +0 -20 src/sys/net/if_gif.c 1.29.2.2 +0 -4 src/sys/net/if_gif.h 1.167.2.8 +7 -5 src/sys/net/route.c 1.27.2.2 +0 -1 src/sys/netinet/icmp6.h 1.208.2.11 +4 -6 src/sys/netinet/if_ether.c 1.143.2.16 +5 -6 src/sys/netinet/in.c 1.50.2.2 +2 -0 src/sys/netinet/in_gif.c 1.99.2.4 +0 -1 src/sys/netinet/in_proto.c 1.79.2.2 +8 -13 src/sys/netinet/in_rmx.c 1.138.2.3 +20 -39 src/sys/netinet/ip_icmp.c 1.28.2.2 +0 -1 src/sys/netinet/ip_icmp.h 1.375.2.9 +33 -39 src/sys/netinet/ip_input.c 1.115.2.5 +6 -7 src/sys/netinet/ip_var.h 1.35.2.3 +2 -2 src/sys/netinet/tcp_hostcache.c 1.411.2.5 +24 -15 src/sys/netinet/tcp_input.c 1.164.2.3 +12 -9 src/sys/netinet/tcp_output.c 1.364.2.3 +7 -14 src/sys/netinet/tcp_reass.c 1.53.2.2 +8 -9 src/sys/netinet/tcp_sack.c 1.350.2.4 +23 -67 src/sys/netinet/tcp_subr.c 1.176.2.3 +7 -12 src/sys/netinet/tcp_syncache.c 1.307.2.4 +4 -4 src/sys/netinet/tcp_timewait.c 1.182.2.4 +6 -50 src/sys/netinet/tcp_var.h 1.262.2.4 +2 -5 src/sys/netinet/udp_usrreq.c 1.42.2.2 +4 -6 src/sys/netinet/udp_var.h 1.50.2.2 +3 -2 src/sys/netinet6/frag6.c 1.117.2.6 +6 -15 src/sys/netinet6/icmp6.c 1.41.2.2 +9 -0 src/sys/netinet6/in6_gif.c 1.74.2.3 +8 -3 src/sys/netinet6/in6_ifattach.c 1.67.2.3 +53 -31 src/sys/netinet6/in6_proto.c 1.46.2.2 +9 -14 src/sys/netinet6/in6_rmx.c 1.74.2.5 +2 -5 src/sys/netinet6/in6_src.c 1.45.2.2 +4 -5 src/sys/netinet6/in6_var.h 1.132.2.4 +12 -95 src/sys/netinet6/ip6_input.c 1.63.2.2 +2 -17 src/sys/netinet6/ip6_mroute.c 1.55.2.3 +24 -29 src/sys/netinet6/ip6_var.h 1.123.2.10 +22 -55 src/sys/netinet6/nd6.c 1.31.2.2 +4 -5 src/sys/netinet6/nd6.h 1.69.2.2 +3 -5 src/sys/netinet6/nd6_nbr.c 1.73.2.4 +7 -5 src/sys/netinet6/nd6_rtr.c 1.111.2.5 +2 -2 src/sys/netinet6/raw_ip6.c 1.29.2.2 +5 -7 src/sys/netinet6/scope6.c 1.4.2.2 +3 -2 src/sys/netipsec/ah_var.h 1.4.2.2 +2 -1 src/sys/netipsec/esp_var.h 1.4.2.3 +2 -1 src/sys/netipsec/ipcomp_var.h 1.5.2.2 +2 -1 src/sys/netipsec/ipip_var.h 1.56.2.2 +1 -0 src/sys/netipsec/ipsec.c 1.26.2.2 +22 -22 src/sys/netipsec/ipsec.h 1.10.2.2 +6 -5 src/sys/netipsec/ipsec6.h 1.62.2.3 +11 -10 src/sys/netipsec/key.c 1.29.2.2 +1 -2 src/sys/netipsec/xform_esp.c