Date: Sun, 14 Nov 2010 13:13:15 -0800 From: mdf@FreeBSD.org To: Dimitry Andric <dim@freebsd.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r215317 - in head/sys: kern mips/mips mips/rmi net netgraph netinet netinet/ipfw netinet6 netipsec powerpc/aim powerpc/booke Message-ID: <AANLkTiktcBdOaBBEg-Zm_iQkqHaK7Dh_gkoLUWb9mO4D@mail.gmail.com> In-Reply-To: <201011142038.oAEKcB9M093130@svn.freebsd.org> References: <201011142038.oAEKcB9M093130@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sun, Nov 14, 2010 at 12:38 PM, Dimitry Andric <dim@freebsd.org> wrote: > Author: dim > Date: Sun Nov 14 20:38:11 2010 > New Revision: 215317 > URL: http://svn.freebsd.org/changeset/base/215317 > > Log: > =A0Apply the STATIC_VNET_DEFINE and STATIC_DPCPU_DEFINE macros throughout > =A0the tree. If "static DPCPU_DEFINE" and "STATIC_DPCPU_DEFINE" are the same thing, it seems backwards to prefer the macro over the C code. Is there a difference? Thanks, matthew > > Modified: > =A0head/sys/kern/kern_clock.c > =A0head/sys/kern/kern_clocksource.c > =A0head/sys/kern/sched_4bsd.c > =A0head/sys/kern/subr_pcpu.c > =A0head/sys/mips/mips/tick.c > =A0head/sys/mips/rmi/tick.c > =A0head/sys/net/flowtable.c > =A0head/sys/net/if.c > =A0head/sys/net/if_clone.c > =A0head/sys/net/if_ethersubr.c > =A0head/sys/net/if_gif.c > =A0head/sys/net/if_llatbl.c > =A0head/sys/net/if_loop.c > =A0head/sys/net/route.c > =A0head/sys/net/vnet.c > =A0head/sys/netgraph/ng_base.c > =A0head/sys/netgraph/ng_eiface.c > =A0head/sys/netgraph/ng_iface.c > =A0head/sys/netinet/if_ether.c > =A0head/sys/netinet/igmp.c > =A0head/sys/netinet/in.c > =A0head/sys/netinet/in_pcb.c > =A0head/sys/netinet/in_rmx.c > =A0head/sys/netinet/ip_divert.c > =A0head/sys/netinet/ip_fastfwd.c > =A0head/sys/netinet/ip_icmp.c > =A0head/sys/netinet/ip_input.c > =A0head/sys/netinet/ip_ipsec.c > =A0head/sys/netinet/ip_mroute.c > =A0head/sys/netinet/ipfw/ip_fw2.c > =A0head/sys/netinet/ipfw/ip_fw_dynamic.c > =A0head/sys/netinet/ipfw/ip_fw_nat.c > =A0head/sys/netinet/ipfw/ip_fw_pfil.c > =A0head/sys/netinet/siftr.c > =A0head/sys/netinet/tcp_hostcache.c > =A0head/sys/netinet/tcp_reass.c > =A0head/sys/netinet/tcp_subr.c > =A0head/sys/netinet/tcp_syncache.c > =A0head/sys/netinet/tcp_timewait.c > =A0head/sys/netinet/udp_usrreq.c > =A0head/sys/netinet6/frag6.c > =A0head/sys/netinet6/icmp6.c > =A0head/sys/netinet6/in6_rmx.c > =A0head/sys/netinet6/in6_src.c > =A0head/sys/netinet6/ip6_ipsec.c > =A0head/sys/netinet6/ip6_mroute.c > =A0head/sys/netinet6/mld6.c > =A0head/sys/netinet6/nd6.c > =A0head/sys/netinet6/nd6_nbr.c > =A0head/sys/netinet6/nd6_rtr.c > =A0head/sys/netinet6/scope6.c > =A0head/sys/netinet6/send.c > =A0head/sys/netipsec/key.c > =A0head/sys/netipsec/keysock.c > =A0head/sys/netipsec/xform_esp.c > =A0head/sys/powerpc/aim/clock.c > =A0head/sys/powerpc/booke/clock.c > > Modified: head/sys/kern/kern_clock.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/kern/kern_clock.c =A0Sun Nov 14 20:23:02 2010 =A0 =A0 =A0 = =A0(r215316) > +++ head/sys/kern/kern_clock.c =A0Sun Nov 14 20:38:11 2010 =A0 =A0 =A0 = =A0(r215317) > @@ -373,7 +373,7 @@ int profprocs; > =A0int =A0 =A0ticks; > =A0int =A0 =A0psratio; > > -static DPCPU_DEFINE(int, pcputicks); =A0 /* Per-CPU version of ticks. */ > +STATIC_DPCPU_DEFINE(int, pcputicks); =A0 /* Per-CPU version of ticks. */ > =A0static int global_hardclock_run =3D 0; > > =A0/* > > Modified: head/sys/kern/kern_clocksource.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/kern/kern_clocksource.c =A0 =A0Sun Nov 14 20:23:02 2010 =A0 = =A0 =A0 =A0(r215316) > +++ head/sys/kern/kern_clocksource.c =A0 =A0Sun Nov 14 20:38:11 2010 =A0 = =A0 =A0 =A0(r215317) > @@ -135,7 +135,7 @@ struct pcpu_state { > =A0 =A0 =A0 =A0int =A0 =A0 =A0 =A0 =A0 =A0 idle; =A0 =A0 =A0 =A0 =A0 /* T= his CPU is in idle mode. */ > =A0}; > > -static DPCPU_DEFINE(struct pcpu_state, timerstate); > +STATIC_DPCPU_DEFINE(struct pcpu_state, timerstate); > > =A0#define FREQ2BT(freq, bt) =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0\ > =A0{ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0\ > > Modified: head/sys/kern/sched_4bsd.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/kern/sched_4bsd.c =A0Sun Nov 14 20:23:02 2010 =A0 =A0 =A0 = =A0(r215316) > +++ head/sys/kern/sched_4bsd.c =A0Sun Nov 14 20:38:11 2010 =A0 =A0 =A0 = =A0(r215317) > @@ -161,7 +161,7 @@ struct pcpuidlestat { > =A0 =A0 =A0 =A0u_int idlecalls; > =A0 =A0 =A0 =A0u_int oldidlecalls; > =A0}; > -static DPCPU_DEFINE(struct pcpuidlestat, idlestat); > +STATIC_DPCPU_DEFINE(struct pcpuidlestat, idlestat); > > =A0static void > =A0setup_runqs(void) > > Modified: head/sys/kern/subr_pcpu.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/kern/subr_pcpu.c =A0 Sun Nov 14 20:23:02 2010 =A0 =A0 =A0 = =A0(r215316) > +++ head/sys/kern/subr_pcpu.c =A0 Sun Nov 14 20:38:11 2010 =A0 =A0 =A0 = =A0(r215317) > @@ -70,7 +70,7 @@ struct dpcpu_free { > =A0 =A0 =A0 =A0TAILQ_ENTRY(dpcpu_free) df_link; > =A0}; > > -static DPCPU_DEFINE(char, modspace[DPCPU_MODMIN]); > +STATIC_DPCPU_DEFINE(char, modspace[DPCPU_MODMIN]); > =A0static TAILQ_HEAD(, dpcpu_free) dpcpu_head =3D TAILQ_HEAD_INITIALIZER(= dpcpu_head); > =A0static struct sx dpcpu_lock; > =A0uintptr_t dpcpu_off[MAXCPU]; > > Modified: head/sys/mips/mips/tick.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/mips/mips/tick.c =A0 Sun Nov 14 20:23:02 2010 =A0 =A0 =A0 = =A0(r215316) > +++ head/sys/mips/mips/tick.c =A0 Sun Nov 14 20:38:11 2010 =A0 =A0 =A0 = =A0(r215317) > @@ -57,13 +57,13 @@ uint64_t counter_freq; > > =A0struct timecounter *platform_timecounter; > > -static DPCPU_DEFINE(uint32_t, cycles_per_tick); > +STATIC_DPCPU_DEFINE(uint32_t, cycles_per_tick); > =A0static uint32_t cycles_per_usec; > > -static DPCPU_DEFINE(volatile uint32_t, counter_upper); > -static DPCPU_DEFINE(volatile uint32_t, counter_lower_last); > -static DPCPU_DEFINE(uint32_t, compare_ticks); > -static DPCPU_DEFINE(uint32_t, lost_ticks); > +STATIC_DPCPU_DEFINE(volatile uint32_t, counter_upper); > +STATIC_DPCPU_DEFINE(volatile uint32_t, counter_lower_last); > +STATIC_DPCPU_DEFINE(uint32_t, compare_ticks); > +STATIC_DPCPU_DEFINE(uint32_t, lost_ticks); > > =A0struct clock_softc { > =A0 =A0 =A0 =A0int intr_rid; > > Modified: head/sys/mips/rmi/tick.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/mips/rmi/tick.c =A0 =A0Sun Nov 14 20:23:02 2010 =A0 =A0 =A0 = =A0(r215316) > +++ head/sys/mips/rmi/tick.c =A0 =A0Sun Nov 14 20:38:11 2010 =A0 =A0 =A0 = =A0(r215317) > @@ -59,13 +59,13 @@ uint64_t counter_freq; > > =A0struct timecounter *platform_timecounter; > > -static DPCPU_DEFINE(uint32_t, cycles_per_tick); > +STATIC_DPCPU_DEFINE(uint32_t, cycles_per_tick); > =A0static uint32_t cycles_per_usec; > > -static DPCPU_DEFINE(volatile uint32_t, counter_upper); > -static DPCPU_DEFINE(volatile uint32_t, counter_lower_last); > -static DPCPU_DEFINE(uint32_t, compare_ticks); > -static DPCPU_DEFINE(uint32_t, lost_ticks); > +STATIC_DPCPU_DEFINE(volatile uint32_t, counter_upper); > +STATIC_DPCPU_DEFINE(volatile uint32_t, counter_lower_last); > +STATIC_DPCPU_DEFINE(uint32_t, compare_ticks); > +STATIC_DPCPU_DEFINE(uint32_t, lost_ticks); > > =A0struct clock_softc { > =A0 =A0 =A0 =A0int intr_rid; > > Modified: head/sys/net/flowtable.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/net/flowtable.c =A0 =A0Sun Nov 14 20:23:02 2010 =A0 =A0 =A0 = =A0(r215316) > +++ head/sys/net/flowtable.c =A0 =A0Sun Nov 14 20:38:11 2010 =A0 =A0 =A0 = =A0(r215317) > @@ -184,10 +184,10 @@ struct flowtable { > =A0} __aligned(CACHE_LINE_SIZE); > > =A0static struct proc *flowcleanerproc; > -static VNET_DEFINE(struct flowtable *, flow_list_head); > -static VNET_DEFINE(uint32_t, flow_hashjitter); > -static VNET_DEFINE(uma_zone_t, flow_ipv4_zone); > -static VNET_DEFINE(uma_zone_t, flow_ipv6_zone); > +STATIC_VNET_DEFINE(struct flowtable *, flow_list_head); > +STATIC_VNET_DEFINE(uint32_t, flow_hashjitter); > +STATIC_VNET_DEFINE(uma_zone_t, flow_ipv4_zone); > +STATIC_VNET_DEFINE(uma_zone_t, flow_ipv6_zone); > > =A0#define =A0 =A0 =A0 =A0V_flow_list_head =A0 =A0 =A0 =A0VNET(flow_list_= head) > =A0#define =A0 =A0 =A0 =A0V_flow_hashjitter =A0 =A0 =A0 VNET(flow_hashjit= ter) > @@ -230,13 +230,13 @@ do { =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0\ > =A0* - idetach() cleanup for options VIMAGE builds. > =A0*/ > =A0VNET_DEFINE(int, flowtable_enable) =3D 1; > -static VNET_DEFINE(int, flowtable_debug); > -static VNET_DEFINE(int, flowtable_syn_expire) =3D SYN_IDLE; > -static VNET_DEFINE(int, flowtable_udp_expire) =3D UDP_IDLE; > -static VNET_DEFINE(int, flowtable_fin_wait_expire) =3D FIN_WAIT_IDLE; > -static VNET_DEFINE(int, flowtable_tcp_expire) =3D TCP_IDLE; > -static VNET_DEFINE(int, flowtable_nmbflows); > -static VNET_DEFINE(int, flowtable_ready) =3D 0; > +STATIC_VNET_DEFINE(int, flowtable_debug); > +STATIC_VNET_DEFINE(int, flowtable_syn_expire) =3D SYN_IDLE; > +STATIC_VNET_DEFINE(int, flowtable_udp_expire) =3D UDP_IDLE; > +STATIC_VNET_DEFINE(int, flowtable_fin_wait_expire) =3D FIN_WAIT_IDLE; > +STATIC_VNET_DEFINE(int, flowtable_tcp_expire) =3D TCP_IDLE; > +STATIC_VNET_DEFINE(int, flowtable_nmbflows); > +STATIC_VNET_DEFINE(int, flowtable_ready) =3D 0; > > =A0#define =A0 =A0 =A0 =A0V_flowtable_enable =A0 =A0 =A0 =A0 =A0 =A0 =A0V= NET(flowtable_enable) > =A0#define =A0 =A0 =A0 =A0V_flowtable_debug =A0 =A0 =A0 =A0 =A0 =A0 =A0 V= NET(flowtable_debug) > > Modified: head/sys/net/if.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/net/if.c =A0 Sun Nov 14 20:23:02 2010 =A0 =A0 =A0 =A0(r21531= 6) > +++ head/sys/net/if.c =A0 Sun Nov 14 20:38:11 2010 =A0 =A0 =A0 =A0(r21531= 7) > @@ -183,7 +183,7 @@ int ifqmaxlen =3D IFQ_MAXLEN; > =A0VNET_DEFINE(struct ifnethead, ifnet); =A0/* depend on static init XXX = */ > =A0VNET_DEFINE(struct ifgrouphead, ifg_head); > > -static VNET_DEFINE(int, if_indexlim) =3D 8; > +STATIC_VNET_DEFINE(int, if_indexlim) =3D 8; > > =A0/* Table of ifnet by index. */ > =A0VNET_DEFINE(struct ifindex_entry *, ifindex_table); > > Modified: head/sys/net/if_clone.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/net/if_clone.c =A0 =A0 Sun Nov 14 20:23:02 2010 =A0 =A0 =A0 = =A0(r215316) > +++ head/sys/net/if_clone.c =A0 =A0 Sun Nov 14 20:38:11 2010 =A0 =A0 =A0 = =A0(r215317) > @@ -56,7 +56,7 @@ static int =A0 =A0if_clone_createif(struct if_c > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0caddr_t params); > > =A0static struct mtx =A0 =A0 =A0if_cloners_mtx; > -static VNET_DEFINE(int, if_cloners_count); > +STATIC_VNET_DEFINE(int, if_cloners_count); > =A0VNET_DEFINE(LIST_HEAD(, if_clone), if_cloners); > > =A0#define =A0 =A0 =A0 =A0V_if_cloners_count =A0 =A0 =A0VNET(if_cloners_c= ount) > > Modified: head/sys/net/if_ethersubr.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/net/if_ethersubr.c Sun Nov 14 20:23:02 2010 =A0 =A0 =A0 =A0(= r215316) > +++ head/sys/net/if_ethersubr.c Sun Nov 14 20:38:11 2010 =A0 =A0 =A0 =A0(= r215317) > @@ -144,7 +144,7 @@ MALLOC_DEFINE(M_ARPCOM, "arpcom", "802.* > =A0#if defined(INET) || defined(INET6) > =A0int > =A0ether_ipfw_chk(struct mbuf **m0, struct ifnet *dst, int shared); > -static VNET_DEFINE(int, ether_ipfw); > +STATIC_VNET_DEFINE(int, ether_ipfw); > =A0#define =A0 =A0 =A0 =A0V_ether_ipfw =A0 =A0VNET(ether_ipfw) > =A0#endif > > > Modified: head/sys/net/if_gif.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/net/if_gif.c =A0 =A0 =A0 Sun Nov 14 20:23:02 2010 =A0 =A0 = =A0 =A0(r215316) > +++ head/sys/net/if_gif.c =A0 =A0 =A0 Sun Nov 14 20:38:11 2010 =A0 =A0 = =A0 =A0(r215317) > @@ -94,7 +94,7 @@ > =A0*/ > =A0static struct mtx gif_mtx; > =A0static MALLOC_DEFINE(M_GIF, "gif", "Generic Tunnel Interface"); > -static VNET_DEFINE(LIST_HEAD(, gif_softc), gif_softc_list); > +STATIC_VNET_DEFINE(LIST_HEAD(, gif_softc), gif_softc_list); > =A0#define =A0 =A0 =A0 =A0V_gif_softc_list =A0 =A0 =A0 =A0VNET(gif_softc_= list) > > =A0void =A0 (*ng_gif_input_p)(struct ifnet *ifp, struct mbuf **mp, int af= ); > @@ -124,7 +124,7 @@ SYSCTL_NODE(_net_link, IFT_GIF, gif, CTL > =A0*/ > =A0#define MAX_GIF_NEST 1 > =A0#endif > -static VNET_DEFINE(int, max_gif_nesting) =3D MAX_GIF_NEST; > +STATIC_VNET_DEFINE(int, max_gif_nesting) =3D MAX_GIF_NEST; > =A0#define =A0 =A0 =A0 =A0V_max_gif_nesting =A0 =A0 =A0 VNET(max_gif_nest= ing) > =A0SYSCTL_VNET_INT(_net_link_gif, OID_AUTO, max_nesting, CTLFLAG_RW, > =A0 =A0 &VNET_NAME(max_gif_nesting), 0, "Max nested tunnels"); > @@ -135,9 +135,9 @@ SYSCTL_VNET_INT(_net_link_gif, OID_AUTO, > =A0* we allow control over this check here. > =A0*/ > =A0#ifdef XBONEHACK > -static VNET_DEFINE(int, parallel_tunnels) =3D 1; > +STATIC_VNET_DEFINE(int, parallel_tunnels) =3D 1; > =A0#else > -static VNET_DEFINE(int, parallel_tunnels) =3D 0; > +STATIC_VNET_DEFINE(int, parallel_tunnels) =3D 0; > =A0#endif > =A0#define =A0 =A0 =A0 =A0V_parallel_tunnels =A0 =A0 =A0VNET(parallel_tun= nels) > =A0SYSCTL_VNET_INT(_net_link_gif, OID_AUTO, parallel_tunnels, CTLFLAG_RW, > > Modified: head/sys/net/if_llatbl.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/net/if_llatbl.c =A0 =A0Sun Nov 14 20:23:02 2010 =A0 =A0 =A0 = =A0(r215316) > +++ head/sys/net/if_llatbl.c =A0 =A0Sun Nov 14 20:38:11 2010 =A0 =A0 =A0 = =A0(r215317) > @@ -62,7 +62,7 @@ __FBSDID("$FreeBSD$"); > > =A0MALLOC_DEFINE(M_LLTABLE, "lltable", "link level address tables"); > > -static VNET_DEFINE(SLIST_HEAD(, lltable), lltables); > +STATIC_VNET_DEFINE(SLIST_HEAD(, lltable), lltables); > =A0#define =A0 =A0 =A0 =A0V_lltables =A0 =A0 =A0VNET(lltables) > > =A0extern void arprequest(struct ifnet *, struct in_addr *, struct in_add= r *, > > Modified: head/sys/net/if_loop.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/net/if_loop.c =A0 =A0 =A0Sun Nov 14 20:23:02 2010 =A0 =A0 = =A0 =A0(r215316) > +++ head/sys/net/if_loop.c =A0 =A0 =A0Sun Nov 14 20:38:11 2010 =A0 =A0 = =A0 =A0(r215317) > @@ -106,8 +106,8 @@ static void lo_clone_destroy(struct ifne > =A0VNET_DEFINE(struct ifnet *, loif); =A0 =A0 /* Used externally */ > > =A0#ifdef VIMAGE > -static VNET_DEFINE(struct ifc_simple_data, lo_cloner_data); > -static VNET_DEFINE(struct if_clone, lo_cloner); > +STATIC_VNET_DEFINE(struct ifc_simple_data, lo_cloner_data); > +STATIC_VNET_DEFINE(struct if_clone, lo_cloner); > =A0#define =A0 =A0 =A0 =A0V_lo_cloner_data =A0 =A0 =A0 =A0VNET(lo_cloner_= data) > =A0#define =A0 =A0 =A0 =A0V_lo_cloner =A0 =A0 =A0 =A0 =A0 =A0 VNET(lo_clo= ner) > =A0#endif > > Modified: head/sys/net/route.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/net/route.c =A0 =A0 =A0 =A0Sun Nov 14 20:23:02 2010 =A0 =A0 = =A0 =A0(r215316) > +++ head/sys/net/route.c =A0 =A0 =A0 =A0Sun Nov 14 20:38:11 2010 =A0 =A0 = =A0 =A0(r215317) > @@ -113,7 +113,7 @@ VNET_DEFINE(int, rttrash); =A0 =A0 =A0 =A0 =A0/* rout= es no > =A0*/ > =A0#define RNTORT(p) =A0 =A0 =A0((struct rtentry *)(p)) > > -static VNET_DEFINE(uma_zone_t, rtzone); =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0/= * Routing table UMA zone. */ > +STATIC_VNET_DEFINE(uma_zone_t, rtzone); =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0/= * Routing table UMA zone. */ > =A0#define =A0 =A0 =A0 =A0V_rtzone =A0 =A0 =A0 =A0VNET(rtzone) > > =A0#if 0 > > Modified: head/sys/net/vnet.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/net/vnet.c Sun Nov 14 20:23:02 2010 =A0 =A0 =A0 =A0(r215316) > +++ head/sys/net/vnet.c Sun Nov 14 20:38:11 2010 =A0 =A0 =A0 =A0(r215317) > @@ -177,7 +177,7 @@ MALLOC_DEFINE(M_VNET_DATA, "vnet_data", > =A0* Space to store virtualized global variables from loadable kernel mod= ules, > =A0* and the free list to manage it. > =A0*/ > -static VNET_DEFINE(char, modspace[VNET_MODMIN]); > +STATIC_VNET_DEFINE(char, modspace[VNET_MODMIN]); > > =A0/* > =A0* Global lists of subsystem constructor and destructors for vnets. =A0= They are > > Modified: head/sys/netgraph/ng_base.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/netgraph/ng_base.c Sun Nov 14 20:23:02 2010 =A0 =A0 =A0 =A0(= r215316) > +++ head/sys/netgraph/ng_base.c Sun Nov 14 20:38:11 2010 =A0 =A0 =A0 =A0(= r215317) > @@ -171,7 +171,7 @@ static struct mtx =A0 ng_typelist_mtx; > > =A0/* Hash related definitions */ > =A0/* XXX Don't need to initialise them because it's a LIST */ > -static VNET_DEFINE(LIST_HEAD(, ng_node), ng_ID_hash[NG_ID_HASH_SIZE]); > +STATIC_VNET_DEFINE(LIST_HEAD(, ng_node), ng_ID_hash[NG_ID_HASH_SIZE]); > =A0#define =A0 =A0 =A0 =A0V_ng_ID_hash =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0VNET(ng_ID_hash) > > =A0static struct mtx =A0 =A0 =A0ng_idhash_mtx; > @@ -189,7 +189,7 @@ static struct mtx =A0 ng_idhash_mtx; > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0} =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 \ > =A0 =A0 =A0 =A0} while (0) > > -static VNET_DEFINE(LIST_HEAD(, ng_node), ng_name_hash[NG_NAME_HASH_SIZE]= ); > +STATIC_VNET_DEFINE(LIST_HEAD(, ng_node), ng_name_hash[NG_NAME_HASH_SIZE]= ); > =A0#define =A0 =A0 =A0 =A0V_ng_name_hash =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0VNET(ng_name_hash) > > =A0static struct mtx =A0 =A0 =A0ng_namehash_mtx; > @@ -359,7 +359,7 @@ ng_alloc_node(void) > =A0#define TRAP_ERROR() > =A0#endif > > -static VNET_DEFINE(ng_ID_t, nextID) =3D 1; > +STATIC_VNET_DEFINE(ng_ID_t, nextID) =3D 1; > =A0#define =A0 =A0 =A0 =A0V_nextID =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0VNET(nextID) > > =A0#ifdef INVARIANTS > > Modified: head/sys/netgraph/ng_eiface.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/netgraph/ng_eiface.c =A0 =A0 =A0 Sun Nov 14 20:23:02 2010 = =A0 =A0 =A0 =A0(r215316) > +++ head/sys/netgraph/ng_eiface.c =A0 =A0 =A0 Sun Nov 14 20:38:11 2010 = =A0 =A0 =A0 =A0(r215317) > @@ -114,7 +114,7 @@ static struct ng_type typestruct =3D { > =A0}; > =A0NETGRAPH_INIT(eiface, &typestruct); > > -static VNET_DEFINE(struct unrhdr *, ng_eiface_unit); > +STATIC_VNET_DEFINE(struct unrhdr *, ng_eiface_unit); > =A0#define =A0 =A0 =A0 =A0V_ng_eiface_unit =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0VNET(ng_eiface_unit) > > =A0/*********************************************************************= *** > > Modified: head/sys/netgraph/ng_iface.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/netgraph/ng_iface.c =A0 =A0 =A0 =A0Sun Nov 14 20:23:02 2010 = =A0 =A0 =A0 =A0(r215316) > +++ head/sys/netgraph/ng_iface.c =A0 =A0 =A0 =A0Sun Nov 14 20:38:11 2010 = =A0 =A0 =A0 =A0(r215317) > @@ -210,7 +210,7 @@ static struct ng_type typestruct =3D { > =A0}; > =A0NETGRAPH_INIT(iface, &typestruct); > > -static VNET_DEFINE(struct unrhdr *, ng_iface_unit); > +STATIC_VNET_DEFINE(struct unrhdr *, ng_iface_unit); > =A0#define =A0 =A0 =A0 =A0V_ng_iface_unit =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= VNET(ng_iface_unit) > > =A0/*********************************************************************= *** > > Modified: head/sys/netinet/if_ether.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/netinet/if_ether.c Sun Nov 14 20:23:02 2010 =A0 =A0 =A0 =A0(= r215316) > +++ head/sys/netinet/if_ether.c Sun Nov 14 20:38:11 2010 =A0 =A0 =A0 =A0(= r215317) > @@ -81,17 +81,17 @@ SYSCTL_NODE(_net_link_ether, PF_INET, in > =A0SYSCTL_NODE(_net_link_ether, PF_ARP, arp, CTLFLAG_RW, 0, ""); > > =A0/* timer values */ > -static VNET_DEFINE(int, arpt_keep) =3D (20*60); =A0/* once resolved, goo= d for 20 > +STATIC_VNET_DEFINE(int, arpt_keep) =3D (20*60); =A0/* once resolved, goo= d for 20 > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 * minutes */ > -static VNET_DEFINE(int, arp_maxtries) =3D 5; > +STATIC_VNET_DEFINE(int, arp_maxtries) =3D 5; > =A0VNET_DEFINE(int, useloopback) =3D 1; =A0 =A0 /* use loopback interface= for > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 * local traffic */ > -static VNET_DEFINE(int, arp_proxyall) =3D 0; > -static VNET_DEFINE(int, arpt_down) =3D 20; =A0 =A0 =A0/* keep incomplete= entries for > +STATIC_VNET_DEFINE(int, arp_proxyall) =3D 0; > +STATIC_VNET_DEFINE(int, arpt_down) =3D 20; =A0 =A0 =A0/* keep incomplete= entries for > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 * 20 seconds */ > =A0VNET_DEFINE(struct arpstat, arpstat); =A0/* ARP statistics, see if_arp= .h */ > > -static VNET_DEFINE(int, arp_maxhold) =3D 1; > +STATIC_VNET_DEFINE(int, arp_maxhold) =3D 1; > > =A0#define =A0 =A0 =A0 =A0V_arpt_keep =A0 =A0 =A0 =A0 =A0 =A0 VNET(arpt_k= eep) > =A0#define =A0 =A0 =A0 =A0V_arpt_down =A0 =A0 =A0 =A0 =A0 =A0 VNET(arpt_d= own) > > Modified: head/sys/netinet/igmp.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/netinet/igmp.c =A0 =A0 Sun Nov 14 20:23:02 2010 =A0 =A0 =A0 = =A0(r215316) > +++ head/sys/netinet/igmp.c =A0 =A0 Sun Nov 14 20:38:11 2010 =A0 =A0 =A0 = =A0(r215317) > @@ -206,11 +206,11 @@ MALLOC_DEFINE(M_IGMP, "igmp", "igmp stat > =A0* FUTURE: Stop using IFP_TO_IA/INADDR_ANY, and use source address sele= ction > =A0* policy to control the address used by IGMP on the link. > =A0*/ > -static VNET_DEFINE(int, interface_timers_running); =A0 =A0 /* IGMPv3 gen= eral > +STATIC_VNET_DEFINE(int, interface_timers_running); =A0 =A0 /* IGMPv3 gen= eral > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 * query response */ > -static VNET_DEFINE(int, state_change_timers_running); =A0/* IGMPv3 state= -change > +STATIC_VNET_DEFINE(int, state_change_timers_running); =A0/* IGMPv3 state= -change > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 * retransmit */ > -static VNET_DEFINE(int, current_state_timers_running); /* IGMPv1/v2 host > +STATIC_VNET_DEFINE(int, current_state_timers_running); /* IGMPv1/v2 host > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 * report; IGMPv3 g/sg > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 * query response */ > > @@ -218,24 +218,24 @@ static VNET_DEFINE(int, current_state_ti > =A0#define =A0 =A0 =A0 =A0V_state_change_timers_running =A0 VNET(state_ch= ange_timers_running) > =A0#define =A0 =A0 =A0 =A0V_current_state_timers_running =A0VNET(current_= state_timers_running) > > -static VNET_DEFINE(LIST_HEAD(, igmp_ifinfo), igi_head); > -static VNET_DEFINE(struct igmpstat, igmpstat) =3D { > +STATIC_VNET_DEFINE(LIST_HEAD(, igmp_ifinfo), igi_head); > +STATIC_VNET_DEFINE(struct igmpstat, igmpstat) =3D { > =A0 =A0 =A0 =A0.igps_version =3D IGPS_VERSION_3, > =A0 =A0 =A0 =A0.igps_len =3D sizeof(struct igmpstat), > =A0}; > -static VNET_DEFINE(struct timeval, igmp_gsrdelay) =3D {10, 0}; > +STATIC_VNET_DEFINE(struct timeval, igmp_gsrdelay) =3D {10, 0}; > > =A0#define =A0 =A0 =A0 =A0V_igi_head =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0VNET(igi_head) > =A0#define =A0 =A0 =A0 =A0V_igmpstat =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0VNET(igmpstat) > =A0#define =A0 =A0 =A0 =A0V_igmp_gsrdelay =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= VNET(igmp_gsrdelay) > > -static VNET_DEFINE(int, igmp_recvifkludge) =3D 1; > -static VNET_DEFINE(int, igmp_sendra) =3D 1; > -static VNET_DEFINE(int, igmp_sendlocal) =3D 1; > -static VNET_DEFINE(int, igmp_v1enable) =3D 1; > -static VNET_DEFINE(int, igmp_v2enable) =3D 1; > -static VNET_DEFINE(int, igmp_legacysupp); > -static VNET_DEFINE(int, igmp_default_version) =3D IGMP_VERSION_3; > +STATIC_VNET_DEFINE(int, igmp_recvifkludge) =3D 1; > +STATIC_VNET_DEFINE(int, igmp_sendra) =3D 1; > +STATIC_VNET_DEFINE(int, igmp_sendlocal) =3D 1; > +STATIC_VNET_DEFINE(int, igmp_v1enable) =3D 1; > +STATIC_VNET_DEFINE(int, igmp_v2enable) =3D 1; > +STATIC_VNET_DEFINE(int, igmp_legacysupp); > +STATIC_VNET_DEFINE(int, igmp_default_version) =3D IGMP_VERSION_3; > > =A0#define =A0 =A0 =A0 =A0V_igmp_recvifkludge =A0 =A0 =A0 =A0 =A0 =A0 VNE= T(igmp_recvifkludge) > =A0#define =A0 =A0 =A0 =A0V_igmp_sendra =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 VNET(igmp_sendra) > > Modified: head/sys/netinet/in.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/netinet/in.c =A0 =A0 =A0 Sun Nov 14 20:23:02 2010 =A0 =A0 = =A0 =A0(r215316) > +++ head/sys/netinet/in.c =A0 =A0 =A0 Sun Nov 14 20:38:11 2010 =A0 =A0 = =A0 =A0(r215317) > @@ -76,12 +76,12 @@ static int =A0in_ifinit(struct ifnet *, > =A0 =A0 =A0 =A0 =A0 =A0struct in_ifaddr *, struct sockaddr_in *, int); > =A0static void =A0 =A0in_purgemaddrs(struct ifnet *); > > -static VNET_DEFINE(int, subnetsarelocal); > +STATIC_VNET_DEFINE(int, subnetsarelocal); > =A0#define =A0 =A0 =A0 =A0V_subnetsarelocal =A0 =A0 =A0 =A0 =A0 =A0 =A0 V= NET(subnetsarelocal) > =A0SYSCTL_VNET_INT(_net_inet_ip, OID_AUTO, subnets_are_local, CTLFLAG_RW, > =A0 =A0 =A0 =A0&VNET_NAME(subnetsarelocal), 0, > =A0 =A0 =A0 =A0"Treat all subnets as directly connected"); > -static VNET_DEFINE(int, sameprefixcarponly); > +STATIC_VNET_DEFINE(int, sameprefixcarponly); > =A0#define =A0 =A0 =A0 =A0V_sameprefixcarponly =A0 =A0 =A0 =A0 =A0 =A0VNE= T(sameprefixcarponly) > =A0SYSCTL_VNET_INT(_net_inet_ip, OID_AUTO, same_prefix_carp_only, CTLFLAG= _RW, > =A0 =A0 =A0 =A0&VNET_NAME(sameprefixcarponly), 0, > > Modified: head/sys/netinet/in_pcb.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/netinet/in_pcb.c =A0 Sun Nov 14 20:23:02 2010 =A0 =A0 =A0 = =A0(r215316) > +++ head/sys/netinet/in_pcb.c =A0 Sun Nov 14 20:38:11 2010 =A0 =A0 =A0 = =A0(r215317) > @@ -108,7 +108,7 @@ VNET_DEFINE(int, ipport_randomcps) =3D 10; > =A0VNET_DEFINE(int, ipport_randomtime) =3D 45; =A0 =A0 =A0/* user control= led via sysctl */ > =A0VNET_DEFINE(int, ipport_stoprandom); =A0 =A0 =A0 =A0 =A0 /* toggled by= ipport_tick */ > =A0VNET_DEFINE(int, ipport_tcpallocs); > -static VNET_DEFINE(int, ipport_tcplastcount); > +STATIC_VNET_DEFINE(int, ipport_tcplastcount); > > =A0#define =A0 =A0 =A0 =A0V_ipport_tcplastcount =A0 =A0 =A0 =A0 =A0 VNET(= ipport_tcplastcount) > > > Modified: head/sys/netinet/in_rmx.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/netinet/in_rmx.c =A0 Sun Nov 14 20:23:02 2010 =A0 =A0 =A0 = =A0(r215316) > +++ head/sys/netinet/in_rmx.c =A0 Sun Nov 14 20:38:11 2010 =A0 =A0 =A0 = =A0(r215317) > @@ -132,21 +132,21 @@ in_matroute(void *v_arg, struct radix_no > =A0 =A0 =A0 =A0return rn; > =A0} > > -static VNET_DEFINE(int, rtq_reallyold) =3D 60*60; /* one hour is "really= old" */ > +STATIC_VNET_DEFINE(int, rtq_reallyold) =3D 60*60; /* one hour is "really= old" */ > =A0#define =A0 =A0 =A0 =A0V_rtq_reallyold =A0 =A0 =A0 =A0 VNET(rtq_really= old) > =A0SYSCTL_VNET_INT(_net_inet_ip, IPCTL_RTEXPIRE, rtexpire, CTLFLAG_RW, > =A0 =A0 &VNET_NAME(rtq_reallyold), 0, > =A0 =A0 "Default expiration time on dynamically learned routes"); > > =A0/* never automatically crank down to less */ > -static VNET_DEFINE(int, rtq_minreallyold) =3D 10; > +STATIC_VNET_DEFINE(int, rtq_minreallyold) =3D 10; > =A0#define =A0 =A0 =A0 =A0V_rtq_minreallyold =A0 =A0 =A0VNET(rtq_minreall= yold) > =A0SYSCTL_VNET_INT(_net_inet_ip, IPCTL_RTMINEXPIRE, rtminexpire, CTLFLAG_= RW, > =A0 =A0 &VNET_NAME(rtq_minreallyold), 0, > =A0 =A0 "Minimum time to attempt to hold onto dynamically learned routes"= ); > > =A0/* 128 cached routes is "too many" */ > -static VNET_DEFINE(int, rtq_toomany) =3D 128; > +STATIC_VNET_DEFINE(int, rtq_toomany) =3D 128; > =A0#define =A0 =A0 =A0 =A0V_rtq_toomany =A0 =A0 =A0 =A0 =A0 VNET(rtq_toom= any) > =A0SYSCTL_VNET_INT(_net_inet_ip, IPCTL_RTMAXCACHE, rtmaxcache, CTLFLAG_RW= , > =A0 =A0 &VNET_NAME(rtq_toomany), 0, > @@ -240,8 +240,8 @@ in_rtqkill(struct radix_node *rn, void * > =A0} > > =A0#define RTQ_TIMEOUT =A0 =A060*10 =A0 /* run no less than once every te= n minutes */ > -static VNET_DEFINE(int, rtq_timeout) =3D RTQ_TIMEOUT; > -static VNET_DEFINE(struct callout, rtq_timer); > +STATIC_VNET_DEFINE(int, rtq_timeout) =3D RTQ_TIMEOUT; > +STATIC_VNET_DEFINE(struct callout, rtq_timer); > > =A0#define =A0 =A0 =A0 =A0V_rtq_timeout =A0 =A0 =A0 =A0 =A0 VNET(rtq_time= out) > =A0#define =A0 =A0 =A0 =A0V_rtq_timer =A0 =A0 =A0 =A0 =A0 =A0 VNET(rtq_ti= mer) > > Modified: head/sys/netinet/ip_divert.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/netinet/ip_divert.c =A0 =A0 =A0 =A0Sun Nov 14 20:23:02 2010 = =A0 =A0 =A0 =A0(r215316) > +++ head/sys/netinet/ip_divert.c =A0 =A0 =A0 =A0Sun Nov 14 20:38:11 2010 = =A0 =A0 =A0 =A0(r215317) > @@ -105,8 +105,8 @@ __FBSDID("$FreeBSD$"); > =A0*/ > > =A0/* Internal variables. */ > -static VNET_DEFINE(struct inpcbhead, divcb); > -static VNET_DEFINE(struct inpcbinfo, divcbinfo); > +STATIC_VNET_DEFINE(struct inpcbhead, divcb); > +STATIC_VNET_DEFINE(struct inpcbinfo, divcbinfo); > > =A0#define =A0 =A0 =A0 =A0V_divcb =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 =A0 VNET(divcb) > =A0#define =A0 =A0 =A0 =A0V_divcbinfo =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 VNET(divcbinfo) > > Modified: head/sys/netinet/ip_fastfwd.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/netinet/ip_fastfwd.c =A0 =A0 =A0 Sun Nov 14 20:23:02 2010 = =A0 =A0 =A0 =A0(r215316) > +++ head/sys/netinet/ip_fastfwd.c =A0 =A0 =A0 Sun Nov 14 20:38:11 2010 = =A0 =A0 =A0 =A0(r215317) > @@ -106,7 +106,7 @@ __FBSDID("$FreeBSD$"); > > =A0#include <machine/in_cksum.h> > > -static VNET_DEFINE(int, ipfastforward_active); > +STATIC_VNET_DEFINE(int, ipfastforward_active); > =A0#define =A0 =A0 =A0 =A0V_ipfastforward_active =A0 =A0 =A0 =A0 =A0VNET(= ipfastforward_active) > > =A0SYSCTL_VNET_INT(_net_inet_ip, OID_AUTO, fastforwarding, CTLFLAG_RW, > > Modified: head/sys/netinet/ip_icmp.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/netinet/ip_icmp.c =A0Sun Nov 14 20:23:02 2010 =A0 =A0 =A0 = =A0(r215316) > +++ head/sys/netinet/ip_icmp.c =A0Sun Nov 14 20:38:11 2010 =A0 =A0 =A0 = =A0(r215317) > @@ -80,55 +80,55 @@ VNET_DEFINE(struct icmpstat, icmpstat); > =A0SYSCTL_VNET_STRUCT(_net_inet_icmp, ICMPCTL_STATS, stats, CTLFLAG_RW, > =A0 =A0 =A0 =A0&VNET_NAME(icmpstat), icmpstat, ""); > > -static VNET_DEFINE(int, icmpmaskrepl) =3D 0; > +STATIC_VNET_DEFINE(int, icmpmaskrepl) =3D 0; > =A0#define =A0 =A0 =A0 =A0V_icmpmaskrepl =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0VNET(icmpmaskrepl) > =A0SYSCTL_VNET_INT(_net_inet_icmp, ICMPCTL_MASKREPL, maskrepl, CTLFLAG_RW= , > =A0 =A0 =A0 =A0&VNET_NAME(icmpmaskrepl), 0, > =A0 =A0 =A0 =A0"Reply to ICMP Address Mask Request packets."); > > -static VNET_DEFINE(u_int, icmpmaskfake) =3D 0; > +STATIC_VNET_DEFINE(u_int, icmpmaskfake) =3D 0; > =A0#define =A0 =A0 =A0 =A0V_icmpmaskfake =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0VNET(icmpmaskfake) > =A0SYSCTL_VNET_UINT(_net_inet_icmp, OID_AUTO, maskfake, CTLFLAG_RW, > =A0 =A0 =A0 =A0&VNET_NAME(icmpmaskfake), 0, > =A0 =A0 =A0 =A0"Fake reply to ICMP Address Mask Request packets."); > > -static VNET_DEFINE(int, drop_redirect) =3D 0; > +STATIC_VNET_DEFINE(int, drop_redirect) =3D 0; > =A0#define =A0 =A0 =A0 =A0V_drop_redirect =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= VNET(drop_redirect) > =A0SYSCTL_VNET_INT(_net_inet_icmp, OID_AUTO, drop_redirect, CTLFLAG_RW, > =A0 =A0 =A0 =A0&VNET_NAME(drop_redirect), 0, > =A0 =A0 =A0 =A0"Ignore ICMP redirects"); > > -static VNET_DEFINE(int, log_redirect) =3D 0; > +STATIC_VNET_DEFINE(int, log_redirect) =3D 0; > =A0#define =A0 =A0 =A0 =A0V_log_redirect =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0VNET(log_redirect) > =A0SYSCTL_VNET_INT(_net_inet_icmp, OID_AUTO, log_redirect, CTLFLAG_RW, > =A0 =A0 =A0 =A0&VNET_NAME(log_redirect), 0, > =A0 =A0 =A0 =A0"Log ICMP redirects to the console"); > > -static VNET_DEFINE(int, icmplim) =3D 200; > +STATIC_VNET_DEFINE(int, icmplim) =3D 200; > =A0#define =A0 =A0 =A0 =A0V_icmplim =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 VNET(icmplim) > =A0SYSCTL_VNET_INT(_net_inet_icmp, ICMPCTL_ICMPLIM, icmplim, CTLFLAG_RW, > =A0 =A0 =A0 =A0&VNET_NAME(icmplim), 0, > =A0 =A0 =A0 =A0"Maximum number of ICMP responses per second"); > > -static VNET_DEFINE(int, icmplim_output) =3D 1; > +STATIC_VNET_DEFINE(int, icmplim_output) =3D 1; > =A0#define =A0 =A0 =A0 =A0V_icmplim_output =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0VNET(icmplim_output) > =A0SYSCTL_VNET_INT(_net_inet_icmp, OID_AUTO, icmplim_output, CTLFLAG_RW, > =A0 =A0 =A0 =A0&VNET_NAME(icmplim_output), 0, > =A0 =A0 =A0 =A0"Enable rate limiting of ICMP responses"); > > -static VNET_DEFINE(char, reply_src[IFNAMSIZ]); > +STATIC_VNET_DEFINE(char, reply_src[IFNAMSIZ]); > =A0#define =A0 =A0 =A0 =A0V_reply_src =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 VNET(reply_src) > =A0SYSCTL_VNET_STRING(_net_inet_icmp, OID_AUTO, reply_src, CTLFLAG_RW, > =A0 =A0 =A0 =A0&VNET_NAME(reply_src), IFNAMSIZ, > =A0 =A0 =A0 =A0"icmp reply source for non-local packets."); > > -static VNET_DEFINE(int, icmp_rfi) =3D 0; > +STATIC_VNET_DEFINE(int, icmp_rfi) =3D 0; > =A0#define =A0 =A0 =A0 =A0V_icmp_rfi =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0VNET(icmp_rfi) > =A0SYSCTL_VNET_INT(_net_inet_icmp, OID_AUTO, reply_from_interface, CTLFLA= G_RW, > =A0 =A0 =A0 =A0&VNET_NAME(icmp_rfi), 0, > =A0 =A0 =A0 =A0"ICMP reply from incoming interface for non-local packets"= ); > > -static VNET_DEFINE(int, icmp_quotelen) =3D 8; > +STATIC_VNET_DEFINE(int, icmp_quotelen) =3D 8; > =A0#define =A0 =A0 =A0 =A0V_icmp_quotelen =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= VNET(icmp_quotelen) > =A0SYSCTL_VNET_INT(_net_inet_icmp, OID_AUTO, quotelen, CTLFLAG_RW, > =A0 =A0 =A0 =A0&VNET_NAME(icmp_quotelen), 0, > @@ -137,7 +137,7 @@ SYSCTL_VNET_INT(_net_inet_icmp, OID_AUTO > =A0/* > =A0* ICMP broadcast echo sysctl > =A0*/ > -static VNET_DEFINE(int, icmpbmcastecho) =3D 0; > +STATIC_VNET_DEFINE(int, icmpbmcastecho) =3D 0; > =A0#define =A0 =A0 =A0 =A0V_icmpbmcastecho =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0VNET(icmpbmcastecho) > =A0SYSCTL_VNET_INT(_net_inet_icmp, OID_AUTO, bmcastecho, CTLFLAG_RW, > =A0 =A0 =A0 =A0&VNET_NAME(icmpbmcastecho), 0, > > Modified: head/sys/netinet/ip_input.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/netinet/ip_input.c Sun Nov 14 20:23:02 2010 =A0 =A0 =A0 =A0(= r215316) > +++ head/sys/netinet/ip_input.c Sun Nov 14 20:38:11 2010 =A0 =A0 =A0 =A0(= r215317) > @@ -96,7 +96,7 @@ SYSCTL_VNET_INT(_net_inet_ip, IPCTL_FORW > =A0 =A0 &VNET_NAME(ipforwarding), 0, > =A0 =A0 "Enable IP forwarding between interfaces"); > > -static VNET_DEFINE(int, ipsendredirects) =3D 1; =A0/* XXX */ > +STATIC_VNET_DEFINE(int, ipsendredirects) =3D 1; =A0/* XXX */ > =A0#define =A0 =A0 =A0 =A0V_ipsendredirects =A0 =A0 =A0 VNET(ipsendredire= cts) > =A0SYSCTL_VNET_INT(_net_inet_ip, IPCTL_SENDREDIRECTS, redirect, CTLFLAG_R= W, > =A0 =A0 &VNET_NAME(ipsendredirects), 0, > @@ -107,13 +107,13 @@ SYSCTL_VNET_INT(_net_inet_ip, IPCTL_DEFT > =A0 =A0 &VNET_NAME(ip_defttl), 0, > =A0 =A0 "Maximum TTL on IP packets"); > > -static VNET_DEFINE(int, ip_keepfaith); > +STATIC_VNET_DEFINE(int, ip_keepfaith); > =A0#define =A0 =A0 =A0 =A0V_ip_keepfaith =A0 =A0 =A0 =A0 =A0VNET(ip_keepf= aith) > =A0SYSCTL_VNET_INT(_net_inet_ip, IPCTL_KEEPFAITH, keepfaith, CTLFLAG_RW, > =A0 =A0 &VNET_NAME(ip_keepfaith), 0, > =A0 =A0 "Enable packet capture for FAITH IPv4->IPv6 translater daemon"); > > -static VNET_DEFINE(int, ip_sendsourcequench); > +STATIC_VNET_DEFINE(int, ip_sendsourcequench); > =A0#define =A0 =A0 =A0 =A0V_ip_sendsourcequench =A0 VNET(ip_sendsourceque= nch) > =A0SYSCTL_VNET_INT(_net_inet_ip, OID_AUTO, sendsourcequench, CTLFLAG_RW, > =A0 =A0 &VNET_NAME(ip_sendsourcequench), 0, > @@ -137,7 +137,7 @@ SYSCTL_VNET_INT(_net_inet_ip, OID_AUTO, > =A0* to the loopback interface instead of the interface where the > =A0* packets for those addresses are received. > =A0*/ > -static VNET_DEFINE(int, ip_checkinterface); > +STATIC_VNET_DEFINE(int, ip_checkinterface); > =A0#define =A0 =A0 =A0 =A0V_ip_checkinterface =A0 =A0 VNET(ip_checkinterf= ace) > =A0SYSCTL_VNET_INT(_net_inet_ip, OID_AUTO, check_interface, CTLFLAG_RW, > =A0 =A0 &VNET_NAME(ip_checkinterface), 0, > @@ -164,8 +164,8 @@ SYSCTL_VNET_STRUCT(_net_inet_ip, IPCTL_S > =A0 =A0 &VNET_NAME(ipstat), ipstat, > =A0 =A0 "IP statistics (struct ipstat, netinet/ip_var.h)"); > > -static VNET_DEFINE(uma_zone_t, ipq_zone); > -static VNET_DEFINE(TAILQ_HEAD(ipqhead, ipq), ipq[IPREASS_NHASH]); > +STATIC_VNET_DEFINE(uma_zone_t, ipq_zone); > +STATIC_VNET_DEFINE(TAILQ_HEAD(ipqhead, ipq), ipq[IPREASS_NHASH]); > =A0static struct mtx ipqlock; > > =A0#define =A0 =A0 =A0 =A0V_ipq_zone =A0 =A0 =A0 =A0 =A0 =A0 =A0VNET(ipq_= zone) > @@ -180,15 +180,15 @@ static void =A0 =A0 =A0 maxnipq_update(void); > =A0static void =A0 =A0ipq_zone_change(void *); > =A0static void =A0 =A0ip_drain_locked(void); > > -static VNET_DEFINE(int, maxnipq); =A0/* Administrative limit on # reass = queues. */ > -static VNET_DEFINE(int, nipq); =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 /* Total = # of reass queues */ > +STATIC_VNET_DEFINE(int, maxnipq); =A0/* Administrative limit on # reass = queues. */ > +STATIC_VNET_DEFINE(int, nipq); =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 /* Total = # of reass queues */ > =A0#define =A0 =A0 =A0 =A0V_maxnipq =A0 =A0 =A0 =A0 =A0 =A0 =A0 VNET(maxn= ipq) > =A0#define =A0 =A0 =A0 =A0V_nipq =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0VNET(= nipq) > =A0SYSCTL_VNET_INT(_net_inet_ip, OID_AUTO, fragpackets, CTLFLAG_RD, > =A0 =A0 &VNET_NAME(nipq), 0, > =A0 =A0 "Current number of IPv4 fragment reassembly queue entries"); > > -static VNET_DEFINE(int, maxfragsperpacket); > +STATIC_VNET_DEFINE(int, maxfragsperpacket); > =A0#define =A0 =A0 =A0 =A0V_maxfragsperpacket =A0 =A0 VNET(maxfragsperpac= ket) > =A0SYSCTL_VNET_INT(_net_inet_ip, OID_AUTO, maxfragsperpacket, CTLFLAG_RW, > =A0 =A0 &VNET_NAME(maxfragsperpacket), 0, > @@ -209,7 +209,7 @@ SYSCTL_VNET_INT(_net_inet_ip, OID_AUTO, > =A0#endif > > =A0#ifdef FLOWTABLE > -static VNET_DEFINE(int, ip_output_flowtable_size) =3D 2048; > +STATIC_VNET_DEFINE(int, ip_output_flowtable_size) =3D 2048; > =A0VNET_DEFINE(struct flowtable *, ip_ft); > =A0#define =A0 =A0 =A0 =A0V_ip_output_flowtable_size =A0 =A0 =A0VNET(ip_o= utput_flowtable_size) > > @@ -1719,7 +1719,7 @@ makedummy: > =A0* locking. =A0This code remains in ip_input.c as ip_mroute.c is option= ally > =A0* compiled. > =A0*/ > -static VNET_DEFINE(int, ip_rsvp_on); > +STATIC_VNET_DEFINE(int, ip_rsvp_on); > =A0VNET_DEFINE(struct socket *, ip_rsvpd); > > =A0#define =A0 =A0 =A0 =A0V_ip_rsvp_on =A0 =A0 =A0 =A0 =A0 =A0VNET(ip_rsv= p_on) > > Modified: head/sys/netinet/ip_ipsec.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/netinet/ip_ipsec.c Sun Nov 14 20:23:02 2010 =A0 =A0 =A0 =A0(= r215316) > +++ head/sys/netinet/ip_ipsec.c Sun Nov 14 20:38:11 2010 =A0 =A0 =A0 =A0(= r215317) > @@ -72,9 +72,9 @@ extern =A0 =A0 =A0 =A0struct protosw inetsw[]; > > =A0#ifdef IPSEC > =A0#ifdef IPSEC_FILTERTUNNEL > -static VNET_DEFINE(int, ip4_ipsec_filtertunnel) =3D 1; > +STATIC_VNET_DEFINE(int, ip4_ipsec_filtertunnel) =3D 1; > =A0#else > -static VNET_DEFINE(int, ip4_ipsec_filtertunnel) =3D 0; > +STATIC_VNET_DEFINE(int, ip4_ipsec_filtertunnel) =3D 0; > =A0#endif > =A0#define =A0 =A0 =A0 =A0V_ip4_ipsec_filtertunnel VNET(ip4_ipsec_filtert= unnel) > > > Modified: head/sys/netinet/ip_mroute.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/netinet/ip_mroute.c =A0 =A0 =A0 =A0Sun Nov 14 20:23:02 2010 = =A0 =A0 =A0 =A0(r215316) > +++ head/sys/netinet/ip_mroute.c =A0 =A0 =A0 =A0Sun Nov 14 20:38:11 2010 = =A0 =A0 =A0 =A0(r215317) > @@ -121,7 +121,7 @@ __FBSDID("$FreeBSD$"); > =A0#define =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0VIFI_INVALID =A0 =A0((vifi_t) -= 1) > =A0#define =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0M_HASCL(m) =A0 =A0 =A0((m)->m_f= lags & M_EXT) > > -static VNET_DEFINE(uint32_t, last_tv_sec); /* last time we processed thi= s */ > +STATIC_VNET_DEFINE(uint32_t, last_tv_sec); /* last time we processed thi= s */ > =A0#define =A0 =A0 =A0 =A0V_last_tv_sec =A0 VNET(last_tv_sec) > > =A0static MALLOC_DEFINE(M_MRTABLE, "mroutetbl", "multicast forwarding cac= he"); > @@ -145,14 +145,14 @@ static struct mtx mrouter_mtx; > =A0static int ip_mrouter_cnt; =A0 =A0 /* # of vnets with active mrouters = */ > =A0static int ip_mrouter_unloading; /* Allow no more V_ip_mrouter sockets= */ > > -static VNET_DEFINE(struct mrtstat, mrtstat); > +STATIC_VNET_DEFINE(struct mrtstat, mrtstat); > =A0#define =A0 =A0 =A0 =A0V_mrtstat =A0 =A0 =A0 =A0 =A0 =A0 =A0 VNET(mrts= tat) > =A0SYSCTL_VNET_STRUCT(_net_inet_ip, OID_AUTO, mrtstat, CTLFLAG_RW, > =A0 =A0 &VNET_NAME(mrtstat), mrtstat, > =A0 =A0 "IPv4 Multicast Forwarding Statistics (struct mrtstat, " > =A0 =A0 "netinet/ip_mroute.h)"); > > -static VNET_DEFINE(u_long, mfchash); > +STATIC_VNET_DEFINE(u_long, mfchash); > =A0#define =A0 =A0 =A0 =A0V_mfchash =A0 =A0 =A0 =A0 =A0 =A0 =A0 VNET(mfch= ash) > =A0#define =A0 =A0 =A0 =A0MFCHASH(a, g) =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 \ > =A0 =A0 =A0 =A0((((a).s_addr >> 20) ^ ((a).s_addr >> 10) ^ (a).s_addr ^ \ > @@ -160,9 +160,9 @@ static VNET_DEFINE(u_long, mfchash); > =A0#define =A0 =A0 =A0 =A0MFCHASHSIZE =A0 =A0 256 > > =A0static u_long mfchashsize; =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 /* = Hash size */ > -static VNET_DEFINE(u_char *, nexpire); =A0 =A0 =A0 =A0 /* 0..mfchashsize= -1 */ > +STATIC_VNET_DEFINE(u_char *, nexpire); =A0 =A0 =A0 =A0 /* 0..mfchashsize= -1 */ > =A0#define =A0 =A0 =A0 =A0V_nexpire =A0 =A0 =A0 =A0 =A0 =A0 =A0 VNET(nexp= ire) > -static VNET_DEFINE(LIST_HEAD(mfchashhdr, mfc)*, mfchashtbl); > +STATIC_VNET_DEFINE(LIST_HEAD(mfchashhdr, mfc)*, mfchashtbl); > =A0#define =A0 =A0 =A0 =A0V_mfchashtbl =A0 =A0 =A0 =A0 =A0 =A0VNET(mfchas= htbl) > > =A0static struct mtx mfc_mtx; > @@ -173,9 +173,9 @@ static struct mtx mfc_mtx; > =A0 =A0 =A0 =A0mtx_init(&mfc_mtx, "IPv4 multicast forwarding cache", NULL= , MTX_DEF) > =A0#define =A0 =A0 =A0 =A0MFC_LOCK_DESTROY() =A0 =A0 =A0mtx_destroy(&mfc_= mtx) > > -static VNET_DEFINE(vifi_t, numvifs); > +STATIC_VNET_DEFINE(vifi_t, numvifs); > =A0#define =A0 =A0 =A0 =A0V_numvifs =A0 =A0 =A0 =A0 =A0 =A0 =A0 VNET(numv= ifs) > -static VNET_DEFINE(struct vif, viftable[MAXVIFS]); > +STATIC_VNET_DEFINE(struct vif, viftable[MAXVIFS]); > =A0#define =A0 =A0 =A0 =A0V_viftable =A0 =A0 =A0 =A0 =A0 =A0 =A0VNET(vift= able) > =A0SYSCTL_VNET_OPAQUE(_net_inet_ip, OID_AUTO, viftable, CTLFLAG_RD, > =A0 =A0 &VNET_NAME(viftable), sizeof(V_viftable), "S,vif[MAXVIFS]", > @@ -191,7 +191,7 @@ static struct mtx vif_mtx; > > =A0static eventhandler_tag if_detach_event_tag =3D NULL; > > -static VNET_DEFINE(struct callout, expire_upcalls_ch); > +STATIC_VNET_DEFINE(struct callout, expire_upcalls_ch); > =A0#define =A0 =A0 =A0 =A0V_expire_upcalls_ch =A0 =A0 VNET(expire_upcalls= _ch) > > =A0#define =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0EXPIRE_TIMEOUT =A0(hz / 4) =A0 = =A0 =A0 =A0/* 4x / second =A0 =A0 =A0 =A0 =A0*/ > @@ -206,9 +206,9 @@ static MALLOC_DEFINE(M_BWMETER, "bwmeter > =A0* expiration time. Periodically, the entries are analysed and processe= d. > =A0*/ > =A0#define =A0 =A0 =A0 =A0BW_METER_BUCKETS =A0 =A0 =A0 =A01024 > -static VNET_DEFINE(struct bw_meter*, bw_meter_timers[BW_METER_BUCKETS]); > +STATIC_VNET_DEFINE(struct bw_meter*, bw_meter_timers[BW_METER_BUCKETS]); > =A0#define =A0 =A0 =A0 =A0V_bw_meter_timers =A0 =A0 =A0 VNET(bw_meter_tim= ers) > -static VNET_DEFINE(struct callout, bw_meter_ch); > +STATIC_VNET_DEFINE(struct callout, bw_meter_ch); > =A0#define =A0 =A0 =A0 =A0V_bw_meter_ch =A0 =A0 =A0 =A0 =A0 VNET(bw_meter= _ch) > =A0#define =A0 =A0 =A0 =A0BW_METER_PERIOD (hz) =A0 =A0 =A0 =A0 =A0 =A0/* = periodical handling of bw meters */ > > @@ -216,16 +216,16 @@ static VNET_DEFINE(struct callout, bw_me > =A0* Pending upcalls are stored in a vector which is flushed when > =A0* full, or periodically > =A0*/ > -static VNET_DEFINE(struct bw_upcall, bw_upcalls[BW_UPCALLS_MAX]); > +STATIC_VNET_DEFINE(struct bw_upcall, bw_upcalls[BW_UPCALLS_MAX]); > =A0#define =A0 =A0 =A0 =A0V_bw_upcalls =A0 =A0 =A0 =A0 =A0 =A0VNET(bw_upc= alls) > -static VNET_DEFINE(u_int, bw_upcalls_n); /* # of pending upcalls */ > +STATIC_VNET_DEFINE(u_int, bw_upcalls_n); /* # of pending upcalls */ > =A0#define =A0 =A0 =A0 =A0V_bw_upcalls_n =A0 =A0 =A0 =A0 =A0VNET(bw_upcal= ls_n) > -static VNET_DEFINE(struct callout, bw_upcalls_ch); > +STATIC_VNET_DEFINE(struct callout, bw_upcalls_ch); > =A0#define =A0 =A0 =A0 =A0V_bw_upcalls_ch =A0 =A0 =A0 =A0 VNET(bw_upcalls= _ch) > > =A0#define BW_UPCALLS_PERIOD (hz) =A0 =A0 =A0 =A0 /* periodical flush of = bw upcalls */ > > -static VNET_DEFINE(struct pimstat, pimstat); > +STATIC_VNET_DEFINE(struct pimstat, pimstat); > =A0#define =A0 =A0 =A0 =A0V_pimstat =A0 =A0 =A0 =A0 =A0 =A0 =A0 VNET(pims= tat) > > =A0SYSCTL_NODE(_net_inet, IPPROTO_PIM, pim, CTLFLAG_RW, 0, "PIM"); > @@ -296,9 +296,9 @@ static struct pim_encap_pimhdr pim_encap > =A0 =A0 0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0/* flags */ > =A0}; > > -static VNET_DEFINE(vifi_t, reg_vif_num) =3D VIFI_INVALID; > +STATIC_VNET_DEFINE(vifi_t, reg_vif_num) =3D VIFI_INVALID; > =A0#define =A0 =A0 =A0 =A0V_reg_vif_num =A0 =A0 =A0 =A0 =A0 VNET(reg_vif_= num) > -static VNET_DEFINE(struct ifnet, multicast_register_if); > +STATIC_VNET_DEFINE(struct ifnet, multicast_register_if); > =A0#define =A0 =A0 =A0 =A0V_multicast_register_if VNET(multicast_register= _if) > > =A0/* > @@ -367,9 +367,9 @@ static const uint32_t mrt_api_support =3D > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 MRT_MFC_FLAGS_BORDER_VIF | > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 MRT_MFC_RP | > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 MRT_MFC_BW_UPCALL); > -static VNET_DEFINE(uint32_t, mrt_api_config); > +STATIC_VNET_DEFINE(uint32_t, mrt_api_config); > =A0#define =A0 =A0 =A0 =A0V_mrt_api_config =A0 =A0 =A0 =A0VNET(mrt_api_co= nfig) > -static VNET_DEFINE(int, pim_assert_enabled); > +STATIC_VNET_DEFINE(int, pim_assert_enabled); > =A0#define =A0 =A0 =A0 =A0V_pim_assert_enabled =A0 =A0VNET(pim_assert_ena= bled) > =A0static struct timeval pim_assert_interval =3D { 3, 0 }; =A0/* Rate lim= it */ > > > Modified: head/sys/netinet/ipfw/ip_fw2.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/netinet/ipfw/ip_fw2.c =A0 =A0 =A0Sun Nov 14 20:23:02 2010 = =A0 =A0 =A0 =A0(r215316) > +++ head/sys/netinet/ipfw/ip_fw2.c =A0 =A0 =A0Sun Nov 14 20:38:11 2010 = =A0 =A0 =A0 =A0(r215317) > @@ -100,10 +100,10 @@ __FBSDID("$FreeBSD$"); > =A0*/ > > =A0/* ipfw_vnet_ready controls when we are open for business */ > -static VNET_DEFINE(int, ipfw_vnet_ready) =3D 0; > +STATIC_VNET_DEFINE(int, ipfw_vnet_ready) =3D 0; > =A0#define =A0 =A0 =A0 =A0V_ipfw_vnet_ready =A0 =A0 =A0 VNET(ipfw_vnet_re= ady) > > -static VNET_DEFINE(int, fw_deny_unknown_exthdrs); > +STATIC_VNET_DEFINE(int, fw_deny_unknown_exthdrs); > =A0#define =A0 =A0 =A0 =A0V_fw_deny_unknown_exthdrs =A0 =A0 =A0 VNET(fw_d= eny_unknown_exthdrs) > > =A0#ifdef IPFIREWALL_DEFAULT_TO_ACCEPT > > Modified: head/sys/netinet/ipfw/ip_fw_dynamic.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/netinet/ipfw/ip_fw_dynamic.c =A0 =A0 =A0 Sun Nov 14 20:23:02= 2010 =A0 =A0 =A0 =A0(r215316) > +++ head/sys/netinet/ipfw/ip_fw_dynamic.c =A0 =A0 =A0 Sun Nov 14 20:38:11= 2010 =A0 =A0 =A0 =A0(r215317) > @@ -118,10 +118,10 @@ __FBSDID("$FreeBSD$"); > =A0/* > =A0* Static variables followed by global ones > =A0*/ > -static VNET_DEFINE(ipfw_dyn_rule **, ipfw_dyn_v); > -static VNET_DEFINE(u_int32_t, dyn_buckets); > -static VNET_DEFINE(u_int32_t, curr_dyn_buckets); > -static VNET_DEFINE(struct callout, ipfw_timeout); > +STATIC_VNET_DEFINE(ipfw_dyn_rule **, ipfw_dyn_v); > +STATIC_VNET_DEFINE(u_int32_t, dyn_buckets); > +STATIC_VNET_DEFINE(u_int32_t, curr_dyn_buckets); > +STATIC_VNET_DEFINE(struct callout, ipfw_timeout); > =A0#define =A0 =A0 =A0 =A0V_ipfw_dyn_v =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0VNET(ipfw_dyn_v) > =A0#define =A0 =A0 =A0 =A0V_dyn_buckets =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 VNET(dyn_buckets) > =A0#define =A0 =A0 =A0 =A0V_curr_dyn_buckets =A0 =A0 =A0 =A0 =A0 =A0 =A0V= NET(curr_dyn_buckets) > @@ -150,12 +150,12 @@ ipfw_dyn_unlock(void) > =A0/* > =A0* Timeouts for various events in handing dynamic rules. > =A0*/ > -static VNET_DEFINE(u_int32_t, dyn_ack_lifetime); > -static VNET_DEFINE(u_int32_t, dyn_syn_lifetime); > -static VNET_DEFINE(u_int32_t, dyn_fin_lifetime); > -static VNET_DEFINE(u_int32_t, dyn_rst_lifetime); > -static VNET_DEFINE(u_int32_t, dyn_udp_lifetime); > -static VNET_DEFINE(u_int32_t, dyn_short_lifetime); > +STATIC_VNET_DEFINE(u_int32_t, dyn_ack_lifetime); > +STATIC_VNET_DEFINE(u_int32_t, dyn_syn_lifetime); > +STATIC_VNET_DEFINE(u_int32_t, dyn_fin_lifetime); > +STATIC_VNET_DEFINE(u_int32_t, dyn_rst_lifetime); > +STATIC_VNET_DEFINE(u_int32_t, dyn_udp_lifetime); > +STATIC_VNET_DEFINE(u_int32_t, dyn_short_lifetime); > > =A0#define =A0 =A0 =A0 =A0V_dyn_ack_lifetime =A0 =A0 =A0 =A0 =A0 =A0 =A0V= NET(dyn_ack_lifetime) > =A0#define =A0 =A0 =A0 =A0V_dyn_syn_lifetime =A0 =A0 =A0 =A0 =A0 =A0 =A0V= NET(dyn_syn_lifetime) > @@ -172,16 +172,16 @@ static VNET_DEFINE(u_int32_t, dyn_short_ > =A0* than dyn_keepalive_period. > =A0*/ > > -static VNET_DEFINE(u_int32_t, dyn_keepalive_interval); > -static VNET_DEFINE(u_int32_t, dyn_keepalive_period); > -static VNET_DEFINE(u_int32_t, dyn_keepalive); > +STATIC_VNET_DEFINE(u_int32_t, dyn_keepalive_interval); > +STATIC_VNET_DEFINE(u_int32_t, dyn_keepalive_period); > +STATIC_VNET_DEFINE(u_int32_t, dyn_keepalive); > > =A0#define =A0 =A0 =A0 =A0V_dyn_keepalive_interval =A0 =A0 =A0 =A0VNET(dy= n_keepalive_interval) > =A0#define =A0 =A0 =A0 =A0V_dyn_keepalive_period =A0 =A0 =A0 =A0 =A0VNET(= dyn_keepalive_period) > =A0#define =A0 =A0 =A0 =A0V_dyn_keepalive =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= VNET(dyn_keepalive) > > -static VNET_DEFINE(u_int32_t, dyn_count); =A0 =A0 =A0/* # of dynamic rul= es */ > -static VNET_DEFINE(u_int32_t, dyn_max); =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0/= * max # of dynamic rules */ > +STATIC_VNET_DEFINE(u_int32_t, dyn_count); =A0 =A0 =A0/* # of dynamic rul= es */ > +STATIC_VNET_DEFINE(u_int32_t, dyn_max); =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0/= * max # of dynamic rules */ > > =A0#define =A0 =A0 =A0 =A0V_dyn_count =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 VNET(dyn_count) > =A0#define =A0 =A0 =A0 =A0V_dyn_max =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 VNET(dyn_max) > > Modified: head/sys/netinet/ipfw/ip_fw_nat.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/netinet/ipfw/ip_fw_nat.c =A0 Sun Nov 14 20:23:02 2010 =A0 = =A0 =A0 =A0(r215316) > +++ head/sys/netinet/ipfw/ip_fw_nat.c =A0 Sun Nov 14 20:38:11 2010 =A0 = =A0 =A0 =A0(r215317) > @@ -52,7 +52,7 @@ __FBSDID("$FreeBSD$"); > > =A0#include <machine/in_cksum.h> =A0/* XXX for in_cksum */ > > -static VNET_DEFINE(eventhandler_tag, ifaddr_event_tag); > +STATIC_VNET_DEFINE(eventhandler_tag, ifaddr_event_tag); > =A0#define =A0 =A0 =A0 =A0V_ifaddr_event_tag =A0 =A0 =A0VNET(ifaddr_event= _tag) > > =A0static void > > Modified: head/sys/netinet/ipfw/ip_fw_pfil.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/netinet/ipfw/ip_fw_pfil.c =A0Sun Nov 14 20:23:02 2010 =A0 = =A0 =A0 =A0(r215316) > +++ head/sys/netinet/ipfw/ip_fw_pfil.c =A0Sun Nov 14 20:38:11 2010 =A0 = =A0 =A0 =A0(r215317) > @@ -63,11 +63,11 @@ __FBSDID("$FreeBSD$"); > > =A0#include <machine/in_cksum.h> > > -static VNET_DEFINE(int, fw_enable) =3D 1; > +STATIC_VNET_DEFINE(int, fw_enable) =3D 1; > =A0#define V_fw_enable =A0 =A0VNET(fw_enable) > > =A0#ifdef INET6 > -static VNET_DEFINE(int, fw6_enable) =3D 1; > +STATIC_VNET_DEFINE(int, fw6_enable) =3D 1; > =A0#define V_fw6_enable =A0 VNET(fw6_enable) > =A0#endif > > > Modified: head/sys/netinet/siftr.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/netinet/siftr.c =A0 =A0Sun Nov 14 20:23:02 2010 =A0 =A0 =A0 = =A0(r215316) > +++ head/sys/netinet/siftr.c =A0 =A0Sun Nov 14 20:38:11 2010 =A0 =A0 =A0 = =A0(r215317) > @@ -260,7 +260,7 @@ struct siftr_stats > =A0 =A0 =A0 =A0uint32_t nskip_out_dejavu; > =A0}; > > -static DPCPU_DEFINE(struct siftr_stats, ss); > +STATIC_DPCPU_DEFINE(struct siftr_stats, ss); > > =A0static volatile unsigned int siftr_exit_pkt_manager_thread =3D 0; > =A0static unsigned int siftr_enabled =3D 0; > > Modified: head/sys/netinet/tcp_hostcache.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/netinet/tcp_hostcache.c =A0 =A0Sun Nov 14 20:23:02 2010 =A0 = =A0 =A0 =A0(r215316) > +++ head/sys/netinet/tcp_hostcache.c =A0 =A0Sun Nov 14 20:38:11 2010 =A0 = =A0 =A0 =A0(r215317) > @@ -106,10 +106,10 @@ __FBSDID("$FreeBSD$"); > =A0#define TCP_HOSTCACHE_EXPIRE =A0 =A0 =A0 =A0 =A0 60*60 =A0 /* one hour= */ > =A0#define TCP_HOSTCACHE_PRUNE =A0 =A0 =A0 =A0 =A0 =A05*60 =A0 =A0/* ever= y 5 minutes */ > > -static VNET_DEFINE(struct tcp_hostcache, tcp_hostcache); > +STATIC_VNET_DEFINE(struct tcp_hostcache, tcp_hostcache); > =A0#define =A0 =A0 =A0 =A0V_tcp_hostcache =A0 =A0 =A0 =A0 VNET(tcp_hostca= che) > > -static VNET_DEFINE(struct callout, tcp_hc_callout); > +STATIC_VNET_DEFINE(struct callout, tcp_hc_callout); > =A0#define =A0 =A0 =A0 =A0V_tcp_hc_callout =A0 =A0 =A0 =A0VNET(tcp_hc_cal= lout) > > =A0static struct hc_metrics *tcp_hc_lookup(struct in_conninfo *); > > Modified: head/sys/netinet/tcp_reass.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/netinet/tcp_reass.c =A0 =A0 =A0 =A0Sun Nov 14 20:23:02 2010 = =A0 =A0 =A0 =A0(r215316) > +++ head/sys/netinet/tcp_reass.c =A0 =A0 =A0 =A0Sun Nov 14 20:38:11 2010 = =A0 =A0 =A0 =A0(r215317) > @@ -80,25 +80,25 @@ static int tcp_reass_sysctl_qsize(SYSCTL > =A0SYSCTL_NODE(_net_inet_tcp, OID_AUTO, reass, CTLFLAG_RW, 0, > =A0 =A0 "TCP Segment Reassembly Queue"); > > -static VNET_DEFINE(int, tcp_reass_maxseg) =3D 0; > +STATIC_VNET_DEFINE(int, tcp_reass_maxseg) =3D 0; > =A0#define =A0 =A0 =A0 =A0V_tcp_reass_maxseg =A0 =A0 =A0 =A0 =A0 =A0 =A0V= NET(tcp_reass_maxseg) > =A0SYSCTL_VNET_PROC(_net_inet_tcp_reass, OID_AUTO, maxsegments, CTLFLAG_R= DTUN, > =A0 =A0 &VNET_NAME(tcp_reass_maxseg), 0, &tcp_reass_sysctl_maxseg, "I", > =A0 =A0 "Global maximum number of TCP Segments in Reassembly Queue"); > > -static VNET_DEFINE(int, tcp_reass_qsize) =3D 0; > +STATIC_VNET_DEFINE(int, tcp_reass_qsize) =3D 0; > =A0#define =A0 =A0 =A0 =A0V_tcp_reass_qsize =A0 =A0 =A0 =A0 =A0 =A0 =A0 V= NET(tcp_reass_qsize) > =A0SYSCTL_VNET_PROC(_net_inet_tcp_reass, OID_AUTO, cursegments, CTLFLAG_R= D, > =A0 =A0 &VNET_NAME(tcp_reass_qsize), 0, &tcp_reass_sysctl_qsize, "I", > =A0 =A0 "Global number of TCP Segments currently in Reassembly Queue"); > > -static VNET_DEFINE(int, tcp_reass_overflows) =3D 0; > +STATIC_VNET_DEFINE(int, tcp_reass_overflows) =3D 0; > =A0#define =A0 =A0 =A0 =A0V_tcp_reass_overflows =A0 =A0 =A0 =A0 =A0 VNET(= tcp_reass_overflows) > =A0SYSCTL_VNET_INT(_net_inet_tcp_reass, OID_AUTO, overflows, CTLFLAG_RD, > =A0 =A0 &VNET_NAME(tcp_reass_overflows), 0, > =A0 =A0 "Global number of TCP Segment Reassembly Queue Overflows"); > > -static VNET_DEFINE(uma_zone_t, tcp_reass_zone); > +STATIC_VNET_DEFINE(uma_zone_t, tcp_reass_zone); > =A0#define =A0 =A0 =A0 =A0V_tcp_reass_zone =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0VNET(tcp_reass_zone) > > =A0/* Initialize TCP reassembly queue */ > > Modified: head/sys/netinet/tcp_subr.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/netinet/tcp_subr.c Sun Nov 14 20:23:02 2010 =A0 =A0 =A0 =A0(= r215316) > +++ head/sys/netinet/tcp_subr.c Sun Nov 14 20:38:11 2010 =A0 =A0 =A0 =A0(= r215317) > @@ -193,13 +193,13 @@ SYSCTL_INT(_net_inet_tcp, OID_AUTO, do_t > =A0SYSCTL_VNET_INT(_net_inet_tcp, OID_AUTO, pcbcount, CTLFLAG_RD, > =A0 =A0 &VNET_NAME(tcbinfo.ipi_count), 0, "Number of active PCBs"); > > -static VNET_DEFINE(int, icmp_may_rst) =3D 1; > +STATIC_VNET_DEFINE(int, icmp_may_rst) =3D 1; > =A0#define =A0 =A0 =A0 =A0V_icmp_may_rst =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0VNET(icmp_may_rst) > =A0SYSCTL_VNET_INT(_net_inet_tcp, OID_AUTO, icmp_may_rst, CTLFLAG_RW, > =A0 =A0 &VNET_NAME(icmp_may_rst), 0, > =A0 =A0 "Certain ICMP unreachable messages may abort connections in SYN_S= ENT"); > > -static VNET_DEFINE(int, tcp_isn_reseed_interval) =3D 0; > +STATIC_VNET_DEFINE(int, tcp_isn_reseed_interval) =3D 0; > =A0#define =A0 =A0 =A0 =A0V_tcp_isn_reseed_interval =A0 =A0 =A0 VNET(tcp_= isn_reseed_interval) > =A0SYSCTL_VNET_INT(_net_inet_tcp, OID_AUTO, isn_reseed_interval, CTLFLAG_= RW, > =A0 =A0 &VNET_NAME(tcp_isn_reseed_interval), 0, > @@ -241,7 +241,7 @@ struct tcpcb_mem { > =A0 =A0 =A0 =A0struct cc_var =A0 =A0 =A0 =A0 =A0 ccv; > =A0}; > > -static VNET_DEFINE(uma_zone_t, tcpcb_zone); > +STATIC_VNET_DEFINE(uma_zone_t, tcpcb_zone); > =A0#define =A0 =A0 =A0 =A0V_tcpcb_zone =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0VNET(tcpcb_zone) > > =A0MALLOC_DEFINE(M_TCPLOG, "tcplog", "TCP address and flags print buffers= "); > @@ -1453,10 +1453,10 @@ tcp6_ctlinput(int cmd, struct sockaddr * > =A0#define ISN_STATIC_INCREMENT 4096 > =A0#define ISN_RANDOM_INCREMENT (4096 - 1) > > -static VNET_DEFINE(u_char, isn_secret[32]); > -static VNET_DEFINE(int, isn_last_reseed); > -static VNET_DEFINE(u_int32_t, isn_offset); > -static VNET_DEFINE(u_int32_t, isn_offset_old); > +STATIC_VNET_DEFINE(u_char, isn_secret[32]); > +STATIC_VNET_DEFINE(int, isn_last_reseed); > +STATIC_VNET_DEFINE(u_int32_t, isn_offset); > +STATIC_VNET_DEFINE(u_int32_t, isn_offset_old); > > =A0#define =A0 =A0 =A0 =A0V_isn_secret =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0VNET(isn_secret) > =A0#define =A0 =A0 =A0 =A0V_isn_last_reseed =A0 =A0 =A0 =A0 =A0 =A0 =A0 V= NET(isn_last_reseed) > > Modified: head/sys/netinet/tcp_syncache.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/netinet/tcp_syncache.c =A0 =A0 Sun Nov 14 20:23:02 2010 =A0 = =A0 =A0 =A0(r215316) > +++ head/sys/netinet/tcp_syncache.c =A0 =A0 Sun Nov 14 20:38:11 2010 =A0 = =A0 =A0 =A0(r215317) > @@ -97,13 +97,13 @@ __FBSDID("$FreeBSD$"); > > =A0#include <security/mac/mac_framework.h> > > -static VNET_DEFINE(int, tcp_syncookies) =3D 1; > +STATIC_VNET_DEFINE(int, tcp_syncookies) =3D 1; > =A0#define =A0 =A0 =A0 =A0V_tcp_syncookies =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0VNET(tcp_syncookies) > =A0SYSCTL_VNET_INT(_net_inet_tcp, OID_AUTO, syncookies, CTLFLAG_RW, > =A0 =A0 &VNET_NAME(tcp_syncookies), 0, > =A0 =A0 "Use TCP SYN cookies if the syncache overflows"); > > -static VNET_DEFINE(int, tcp_syncookiesonly) =3D 0; > +STATIC_VNET_DEFINE(int, tcp_syncookiesonly) =3D 0; > =A0#define =A0 =A0 =A0 =A0V_tcp_syncookiesonly =A0 =A0 =A0 =A0 =A0 =A0VNE= T(tcp_syncookiesonly) > =A0SYSCTL_VNET_INT(_net_inet_tcp, OID_AUTO, syncookies_only, CTLFLAG_RW, > =A0 =A0 &VNET_NAME(tcp_syncookiesonly), 0, > @@ -143,7 +143,7 @@ static struct syncache > =A0#define TCP_SYNCACHE_HASHSIZE =A0 =A0 =A0 =A0 =A0512 > =A0#define TCP_SYNCACHE_BUCKETLIMIT =A0 =A0 =A0 30 > > -static VNET_DEFINE(struct tcp_syncache, tcp_syncache); > +STATIC_VNET_DEFINE(struct tcp_syncache, tcp_syncache); > =A0#define =A0 =A0 =A0 =A0V_tcp_syncache =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0VNET(tcp_syncache) > > =A0SYSCTL_NODE(_net_inet_tcp, OID_AUTO, syncache, CTLFLAG_RW, 0, "TCP SYN= cache"); > > Modified: head/sys/netinet/tcp_timewait.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/netinet/tcp_timewait.c =A0 =A0 Sun Nov 14 20:23:02 2010 =A0 = =A0 =A0 =A0(r215316) > +++ head/sys/netinet/tcp_timewait.c =A0 =A0 Sun Nov 14 20:38:11 2010 =A0 = =A0 =A0 =A0(r215317) > @@ -92,7 +92,7 @@ __FBSDID("$FreeBSD$"); > > =A0#include <security/mac/mac_framework.h> > > -static VNET_DEFINE(uma_zone_t, tcptw_zone); > +STATIC_VNET_DEFINE(uma_zone_t, tcptw_zone); > =A0#define =A0 =A0 =A0 =A0V_tcptw_zone =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0VNET(tcptw_zone) > =A0static int =A0 =A0 maxtcptw; > > @@ -102,7 +102,7 @@ static int =A0maxtcptw; > =A0* queue pointers in each tcptw structure, are protected using the glob= al > =A0* tcbinfo lock, which must be held over queue iteration and modificati= on. > =A0*/ > -static VNET_DEFINE(TAILQ_HEAD(, tcptw), twq_2msl); > +STATIC_VNET_DEFINE(TAILQ_HEAD(, tcptw), twq_2msl); > =A0#define =A0 =A0 =A0 =A0V_twq_2msl =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0VNET(twq_2msl) > > =A0static void =A0 =A0tcp_tw_2msl_reset(struct tcptw *, int); > > Modified: head/sys/netinet/udp_usrreq.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/netinet/udp_usrreq.c =A0 =A0 =A0 Sun Nov 14 20:23:02 2010 = =A0 =A0 =A0 =A0(r215316) > +++ head/sys/netinet/udp_usrreq.c =A0 =A0 =A0 Sun Nov 14 20:38:11 2010 = =A0 =A0 =A0 =A0(r215317) > @@ -131,7 +131,7 @@ SYSCTL_ULONG(_net_inet_udp, UDPCTL_RECVS > > =A0VNET_DEFINE(struct inpcbhead, udb); =A0 =A0 =A0 =A0 =A0 =A0/* from udp= _var.h */ > =A0VNET_DEFINE(struct inpcbinfo, udbinfo); > -static VNET_DEFINE(uma_zone_t, udpcb_zone); > +STATIC_VNET_DEFINE(uma_zone_t, udpcb_zone); > > *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?AANLkTiktcBdOaBBEg-Zm_iQkqHaK7Dh_gkoLUWb9mO4D>