Author: rwatson
Date: Thu Jul 16 21:13:04 2009
New Revision: 195727
URL: http://svn.freebsd.org/changeset/base/195727
Log:
Remove unused VNET_SET() and related macros; only VNET_GET() is
ever actually used. Rename VNET_GET() to VNET() to shorten
variable references.
Discussed with: bz, julian
Reviewed by: bz
Approved by: re (kensmith, kib)
Modified:
head/sys/net/flowtable.c
head/sys/net/flowtable.h
head/sys/net/if.c
head/sys/net/if_clone.c
head/sys/net/if_ethersubr.c
head/sys/net/if_gif.c
head/sys/net/if_gif.h
head/sys/net/if_loop.c
head/sys/net/if_var.h
head/sys/net/raw_cb.h
head/sys/net/route.c
head/sys/net/vnet.h
head/sys/netgraph/ng_base.c
head/sys/netgraph/ng_eiface.c
head/sys/netgraph/ng_iface.c
head/sys/netinet/icmp6.h
head/sys/netinet/icmp_var.h
head/sys/netinet/if_ether.c
head/sys/netinet/igmp.c
head/sys/netinet/in.c
head/sys/netinet/in_pcb.c
head/sys/netinet/in_pcb.h
head/sys/netinet/in_rmx.c
head/sys/netinet/in_var.h
head/sys/netinet/ip_divert.c
head/sys/netinet/ip_fastfwd.c
head/sys/netinet/ip_fw.h
head/sys/netinet/ip_icmp.c
head/sys/netinet/ip_input.c
head/sys/netinet/ip_ipsec.c
head/sys/netinet/ip_var.h
head/sys/netinet/ipfw/ip_fw2.c
head/sys/netinet/ipfw/ip_fw_nat.c
head/sys/netinet/raw_ip.c
head/sys/netinet/tcp_hostcache.c
head/sys/netinet/tcp_reass.c
head/sys/netinet/tcp_sack.c
head/sys/netinet/tcp_subr.c
head/sys/netinet/tcp_syncache.c
head/sys/netinet/tcp_timewait.c
head/sys/netinet/tcp_var.h
head/sys/netinet/udp_usrreq.c
head/sys/netinet/udp_var.h
head/sys/netinet6/frag6.c
head/sys/netinet6/icmp6.c
head/sys/netinet6/in6_ifattach.c
head/sys/netinet6/in6_rmx.c
head/sys/netinet6/in6_src.c
head/sys/netinet6/in6_var.h
head/sys/netinet6/ip6_input.c
head/sys/netinet6/ip6_ipsec.c
head/sys/netinet6/ip6_mroute.c
head/sys/netinet6/ip6_var.h
head/sys/netinet6/mld6.c
head/sys/netinet6/nd6.c
head/sys/netinet6/nd6.h
head/sys/netinet6/nd6_nbr.c
head/sys/netinet6/nd6_rtr.c
head/sys/netinet6/raw_ip6.c
head/sys/netinet6/raw_ip6.h
head/sys/netinet6/scope6.c
head/sys/netinet6/tcp6_var.h
head/sys/netipsec/ah_var.h
head/sys/netipsec/esp_var.h
head/sys/netipsec/ipcomp_var.h
head/sys/netipsec/ipip_var.h
head/sys/netipsec/ipsec.h
head/sys/netipsec/ipsec6.h
head/sys/netipsec/key.c
head/sys/netipsec/key_debug.h
head/sys/netipsec/keysock.c
head/sys/netipsec/keysock.h
head/sys/netipsec/xform_esp.c
Modified: head/sys/net/flowtable.c
==============================================================================
--- head/sys/net/flowtable.c Thu Jul 16 20:29:36 2009 (r195726)
+++ head/sys/net/flowtable.c Thu Jul 16 21:13:04 2009 (r195727)
@@ -168,10 +168,10 @@ static VNET_DEFINE(uint32_t, flow_hashji
static VNET_DEFINE(uma_zone_t, flow_ipv4_zone);
static VNET_DEFINE(uma_zone_t, flow_ipv6_zone);
-#define V_flow_list_head VNET_GET(flow_list_head)
-#define V_flow_hashjitter VNET_GET(flow_hashjitter)
-#define V_flow_ipv4_zone VNET_GET(flow_ipv4_zone)
-#define V_flow_ipv6_zone VNET_GET(flow_ipv6_zone)
+#define V_flow_list_head VNET(flow_list_head)
+#define V_flow_hashjitter VNET(flow_hashjitter)
+#define V_flow_ipv4_zone VNET(flow_ipv4_zone)
+#define V_flow_ipv6_zone VNET(flow_ipv6_zone)
static int flowtable_iattach(const void *);
#ifdef VIMAGE
@@ -217,19 +217,19 @@ static VNET_DEFINE(int, flowtable_fin_wa
static VNET_DEFINE(int, flowtable_tcp_expire) = TCP_IDLE;
static VNET_DEFINE(int, flowtable_nmbflows) = 4096;
-#define V_flowtable_enable VNET_GET(flowtable_enable)
-#define V_flowtable_hits VNET_GET(flowtable_hits)
-#define V_flowtable_lookups VNET_GET(flowtable_lookups)
-#define V_flowtable_misses VNET_GET(flowtable_misses)
-#define V_flowtable_frees VNET_GET(flowtable_frees)
-#define V_flowtable_free_checks VNET_GET(flowtable_free_checks)
-#define V_flowtable_max_depth VNET_GET(flowtable_max_depth)
-#define V_flowtable_collisions VNET_GET(flowtable_collisions)
-#define V_flowtable_syn_expire VNET_GET(flowtable_syn_expire)
-#define V_flowtable_udp_expire VNET_GET(flowtable_udp_expire)
-#define V_flowtable_fin_wait_expire
VNET_GET(flowtable_fin_wait_expire)
-#define V_flowtable_tcp_expire VNET_GET(flowtable_tcp_expire)
-#define V_flowtable_nmbflows VNET_GET(flowtable_nmbflows)
+#define V_flowtable_enable VNET(flowtable_enable)
+#define V_flowtable_hits VNET(flowtable_hits)
+#define V_flowtable_lookups VNET(flowtable_lookups)
+#define V_flowtable_misses VNET(flowtable_misses)
+#define V_flowtable_frees VNET(flowtable_frees)
+#define V_flowtable_free_checks VNET(flowtable_free_checks)
+#define V_flowtable_max_depth VNET(flowtable_max_depth)
+#define V_flowtable_collisions VNET(flowtable_collisions)
+#define V_flowtable_syn_expire VNET(flowtable_syn_expire)
+#define V_flowtable_udp_expire VNET(flowtable_udp_expire)
+#define V_flowtable_fin_wait_expire VNET(flowtable_fin_wait_expire)
+#define V_flowtable_tcp_expire VNET(flowtable_tcp_expire)
+#define V_flowtable_nmbflows VNET(flowtable_nmbflows)
SYSCTL_NODE(_net_inet, OID_AUTO, flowtable, CTLFLAG_RD, NULL, "flowtable");
SYSCTL_VNET_INT(_net_inet_flowtable, OID_AUTO, enable, CTLFLAG_RW,
Modified: head/sys/net/flowtable.h
==============================================================================
--- head/sys/net/flowtable.h Thu Jul 16 20:29:36 2009 (r195726)
+++ head/sys/net/flowtable.h Thu Jul 16 21:13:04 2009 (r195727)
@@ -39,7 +39,7 @@ $FreeBSD$
struct flowtable;
VNET_DECLARE(struct flowtable *, ip_ft);
-#define V_ip_ft VNET_GET(ip_ft)
+#define V_ip_ft VNET(ip_ft)
struct flowtable *flowtable_alloc(int nentry, int flags);
Modified: head/sys/net/if.c
==============================================================================
--- head/sys/net/if.c Thu Jul 16 20:29:36 2009 (r195726)
+++ head/sys/net/if.c Thu Jul 16 21:13:04 2009 (r195727)
@@ -163,8 +163,8 @@ static VNET_DEFINE(int, if_indexlim) = 8
/* Table of ifnet by index. Locked with ifnet_lock. */
static VNET_DEFINE(struct ifindex_entry *, ifindex_table);
-#define V_if_indexlim VNET_GET(if_indexlim)
-#define V_ifindex_table VNET_GET(ifindex_table)
+#define V_if_indexlim VNET(if_indexlim)
+#define V_ifindex_table VNET(ifindex_table)
int ifqmaxlen = IFQ_MAXLEN;
struct rwlock ifnet_lock;
Modified: head/sys/net/if_clone.c
==============================================================================
--- head/sys/net/if_clone.c Thu Jul 16 20:29:36 2009 (r195726)
+++ head/sys/net/if_clone.c Thu Jul 16 21:13:04 2009 (r195727)
@@ -61,8 +61,8 @@ static struct mtx if_cloners_mtx;
static VNET_DEFINE(int, if_cloners_count);
VNET_DEFINE(LIST_HEAD(, if_clone), if_cloners);
-#define V_if_cloners_count VNET_GET(if_cloners_count)
-#define V_if_cloners VNET_GET(if_cloners)
+#define V_if_cloners_count VNET(if_cloners_count)
+#define V_if_cloners VNET(if_cloners)
#define IF_CLONERS_LOCK_INIT() \
mtx_init(&if_cloners_mtx, "if_cloners lock", NULL, MTX_DEF)
Modified: head/sys/net/if_ethersubr.c
==============================================================================
--- head/sys/net/if_ethersubr.c Thu Jul 16 20:29:36 2009 (r195726)
+++ head/sys/net/if_ethersubr.c Thu Jul 16 21:13:04 2009 (r195727)
@@ -149,7 +149,7 @@ MALLOC_DEFINE(M_ARPCOM, "arpcom", "802.*
int
ether_ipfw_chk(struct mbuf **m0, struct ifnet *dst, int shared);
static VNET_DEFINE(int, ether_ipfw);
-#define V_ether_ipfw VNET_GET(ether_ipfw)
+#define V_ether_ipfw VNET(ether_ipfw)
#endif
Modified: head/sys/net/if_gif.c
==============================================================================
--- head/sys/net/if_gif.c Thu Jul 16 20:29:36 2009 (r195726)
+++ head/sys/net/if_gif.c Thu Jul 16 21:13:04 2009 (r195727)
@@ -99,17 +99,17 @@ static VNET_DEFINE(LIST_HEAD(, gif_softc
static VNET_DEFINE(int, max_gif_nesting);
static VNET_DEFINE(int, parallel_tunnels);
-#define V_gif_softc_list VNET_GET(gif_softc_list)
-#define V_max_gif_nesting VNET_GET(max_gif_nesting)
-#define V_parallel_tunnels VNET_GET(parallel_tunnels)
+#define V_gif_softc_list VNET(gif_softc_list)
+#define V_max_gif_nesting VNET(max_gif_nesting)
+#define V_parallel_tunnels VNET(parallel_tunnels)
#ifdef INET
VNET_DEFINE(int, ip_gif_ttl);
-#define V_ip_gif_ttl VNET_GET(ip_gif_ttl)
+#define V_ip_gif_ttl VNET(ip_gif_ttl)
#endif
#ifdef INET6
VNET_DEFINE(int, ip6_gif_hlim);
-#define V_ip6_gif_hlim VNET_GET(ip6_gif_hlim)
+#define V_ip6_gif_hlim VNET(ip6_gif_hlim)
#endif
void (*ng_gif_input_p)(struct ifnet *ifp, struct mbuf **mp, int af);
Modified: head/sys/net/if_gif.h
==============================================================================
--- head/sys/net/if_gif.h Thu Jul 16 20:29:36 2009 (r195726)
+++ head/sys/net/if_gif.h Thu Jul 16 21:13:04 2009 (r195727)
@@ -120,7 +120,7 @@ void gif_delete_tunnel(struct ifnet *);
int gif_encapcheck(const struct mbuf *, int, int, void *);
VNET_DECLARE(int, ip_gif_ttl);
-#define V_ip_gif_ttl VNET_GET(ip_gif_ttl)
+#define V_ip_gif_ttl VNET(ip_gif_ttl)
#endif /* _KERNEL */
Modified: head/sys/net/if_loop.c
==============================================================================
--- head/sys/net/if_loop.c Thu Jul 16 20:29:36 2009 (r195726)
+++ head/sys/net/if_loop.c Thu Jul 16 21:13:04 2009 (r195727)
@@ -113,8 +113,8 @@ VNET_DEFINE(struct ifnet *, loif); /* Us
#ifdef VIMAGE
static VNET_DEFINE(struct ifc_simple_data *, lo_cloner_data);
static VNET_DEFINE(struct if_clone *, lo_cloner);
-#define V_lo_cloner_data VNET_GET(lo_cloner_data)
-#define V_lo_cloner VNET_GET(lo_cloner)
+#define V_lo_cloner_data VNET(lo_cloner_data)
+#define V_lo_cloner VNET(lo_cloner)
MALLOC_DEFINE(M_LO_CLONER, "lo_cloner", "lo_cloner");
#endif
Modified: head/sys/net/if_var.h
==============================================================================
--- head/sys/net/if_var.h Thu Jul 16 20:29:36 2009 (r195726)
+++ head/sys/net/if_var.h Thu Jul 16 21:13:04 2009 (r195727)
@@ -785,10 +785,10 @@ VNET_DECLARE(struct ifgrouphead, ifg_hea
VNET_DECLARE(int, if_index);
VNET_DECLARE(struct ifnet *, loif); /* first loopback interface */
-#define V_ifnet VNET_GET(ifnet)
-#define V_ifg_head VNET_GET(ifg_head)
-#define V_if_index VNET_GET(if_index)
-#define V_loif VNET_GET(loif)
+#define V_ifnet VNET(ifnet)
+#define V_ifg_head VNET(ifg_head)
+#define V_if_index VNET(if_index)
+#define V_loif VNET(loif)
extern int ifqmaxlen;
Modified: head/sys/net/raw_cb.h
==============================================================================
--- head/sys/net/raw_cb.h Thu Jul 16 20:29:36 2009 (r195726)
+++ head/sys/net/raw_cb.h Thu Jul 16 21:13:04 2009 (r195727)
@@ -56,7 +56,7 @@ struct rawcb {
#ifdef _KERNEL
VNET_DECLARE(LIST_HEAD(rawcb_list_head, rawcb), rawcb_list);
-#define V_rawcb_list VNET_GET(rawcb_list)
+#define V_rawcb_list VNET(rawcb_list)
extern struct mtx rawcb_mtx;
Modified: head/sys/net/route.c
==============================================================================
--- head/sys/net/route.c Thu Jul 16 20:29:36 2009 (r195726)
+++ head/sys/net/route.c Thu Jul 16 21:13:04 2009 (r195727)
@@ -92,10 +92,10 @@ static VNET_DEFINE(uma_zone_t, rtzone);
VNET_DEFINE(int, rttrash); /* routes not in table but not freed */
VNET_DEFINE(struct rtstat, rtstat);
-#define V_rt_tables VNET_GET(rt_tables)
-#define V_rtzone VNET_GET(rtzone)
-#define V_rttrash VNET_GET(rttrash)
-#define V_rtstat VNET_GET(rtstat)
+#define V_rt_tables VNET(rt_tables)
+#define V_rtzone VNET(rtzone)
+#define V_rttrash VNET(rttrash)
+#define V_rtstat VNET(rtstat)
static void rt_maskedcopy(struct sockaddr *,
struct sockaddr *, struct sockaddr *);
Modified: head/sys/net/vnet.h
==============================================================================
--- head/sys/net/vnet.h Thu Jul 16 20:29:36 2009 (r195726)
+++ head/sys/net/vnet.h Thu Jul 16 21:13:04 2009 (r195727)
@@ -53,19 +53,16 @@ __asm__(".previous");
#define _VNET_PTR(b, n) (__typeof(VNET_NAME(n))*)
\
((b) + (uintptr_t)&VNET_NAME(n))
-#define _VNET_GET(b, n) (*_VNET_PTR(b, n))
-#define _VNET_SET(b, n, v) (*_VNET_PTR(b, n) = v)
+#define _VNET(b, n) (*_VNET_PTR(b, n))
/*
* Virtualized global variable accessor macros.
*/
#define VNET_VNET_PTR(vnet, n)
_VNET_PTR((vnet)->vnet_data_base, n)
-#define VNET_VNET_GET(vnet, n) (*VNET_VNET_PTR((vnet), n))
-#define VNET_VNET_SET(vnet, n, v) ((*VNET_VNET_PTR((vnet), n)) =
v)
+#define VNET_VNET(vnet, n) (*VNET_VNET_PTR((vnet), n))
#define VNET_PTR(n) VNET_VNET_PTR(curvnet, n)
-#define VNET_GET(n) VNET_VNET_GET(curvnet, n)
-#define VNET_SET(n, v) VNET_VNET_SET(curvnet, n, v)
+#define VNET(n) VNET_VNET(curvnet, n)
/*
* Sysctl variants for vnet-virtualized global variables. Include
@@ -143,12 +140,10 @@ void vnet_data_destroy(struct vnet *vne
* Virtualized global variable accessor macros.
*/
#define VNET_VNET_PTR(vnet, n) (&(n))
-#define VNET_VNET_GET(vnet, n) (n)
-#define VNET_VNET_SET(vnet, n, v) ((n) = (v))
+#define VNET_VNET(vnet, n) (n)
#define VNET_PTR(n) (&(n))
-#define VNET_GET(n) (n)
-#define VNET_SET(n, v) ((n) = (v))
+#define VNET(n) (n)
#endif /* VIMAGE */
Modified: head/sys/netgraph/ng_base.c
==============================================================================
--- head/sys/netgraph/ng_base.c Thu Jul 16 20:29:36 2009 (r195726)
+++ head/sys/netgraph/ng_base.c Thu Jul 16 21:13:04 2009 (r195727)
@@ -177,7 +177,7 @@ static struct mtx ng_typelist_mtx;
/* Hash related definitions */
/* 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]);
-#define V_ng_ID_hash VNET_GET(ng_ID_hash)
+#define V_ng_ID_hash VNET(ng_ID_hash)
static struct mtx ng_idhash_mtx;
/* Method to find a node.. used twice so do it here */
@@ -195,7 +195,7 @@ static struct mtx ng_idhash_mtx;
} while (0)
static VNET_DEFINE(LIST_HEAD(, ng_node), ng_name_hash[NG_NAME_HASH_SIZE]);
-#define V_ng_name_hash VNET_GET(ng_name_hash)
+#define V_ng_name_hash VNET(ng_name_hash)
static struct mtx ng_namehash_mtx;
#define NG_NAMEHASH(NAME, HASH) \
@@ -365,7 +365,7 @@ ng_alloc_node(void)
#endif
static VNET_DEFINE(ng_ID_t, nextID) = 1;
-#define V_nextID VNET_GET(nextID)
+#define V_nextID VNET(nextID)
#ifdef INVARIANTS
#define CHECK_DATA_MBUF(m) do { \
Modified: head/sys/netgraph/ng_eiface.c
==============================================================================
--- head/sys/netgraph/ng_eiface.c Thu Jul 16 20:29:36 2009
(r195726)
+++ head/sys/netgraph/ng_eiface.c Thu Jul 16 21:13:04 2009
(r195727)
@@ -117,7 +117,7 @@ static vnet_attach_fn ng_eiface_iattach;
static vnet_detach_fn ng_eiface_idetach;
static VNET_DEFINE(struct unrhdr *, ng_eiface_unit);
-#define V_ng_eiface_unit VNET_GET(ng_eiface_unit)
+#define V_ng_eiface_unit VNET(ng_eiface_unit)
#ifdef VIMAGE
static vnet_modinfo_t vnet_ng_eiface_modinfo = {
Modified: head/sys/netgraph/ng_iface.c
==============================================================================
--- head/sys/netgraph/ng_iface.c Thu Jul 16 20:29:36 2009
(r195726)
+++ head/sys/netgraph/ng_iface.c Thu Jul 16 21:13:04 2009
(r195727)
@@ -213,7 +213,7 @@ static vnet_attach_fn ng_iface_iattach;
static vnet_detach_fn ng_iface_idetach;
static VNET_DEFINE(struct unrhdr *, ng_iface_unit);
-#define V_ng_iface_unit VNET_GET(ng_iface_unit)
+#define V_ng_iface_unit VNET(ng_iface_unit)
#ifdef VIMAGE
static vnet_modinfo_t vnet_ng_iface_modinfo = {
Modified: head/sys/netinet/icmp6.h
==============================================================================
--- head/sys/netinet/icmp6.h Thu Jul 16 20:29:36 2009 (r195726)
+++ head/sys/netinet/icmp6.h Thu Jul 16 21:13:04 2009 (r195727)
@@ -719,8 +719,8 @@ do { \
VNET_DECLARE(int, icmp6_rediraccept); /* accept/process redirects */
VNET_DECLARE(int, icmp6_redirtimeout); /* cache time for redirect routes */
-#define V_icmp6_rediraccept VNET_GET(icmp6_rediraccept)
-#define V_icmp6_redirtimeout VNET_GET(icmp6_redirtimeout)
+#define V_icmp6_rediraccept VNET(icmp6_rediraccept)
+#define V_icmp6_redirtimeout VNET(icmp6_redirtimeout)
#define ICMP6_NODEINFO_FQDNOK 0x1
#define ICMP6_NODEINFO_NODEADDROK 0x2
Modified: head/sys/netinet/icmp_var.h
==============================================================================
--- head/sys/netinet/icmp_var.h Thu Jul 16 20:29:36 2009 (r195726)
+++ head/sys/netinet/icmp_var.h Thu Jul 16 21:13:04 2009 (r195727)
@@ -81,7 +81,7 @@ struct icmpstat {
SYSCTL_DECL(_net_inet_icmp);
VNET_DECLARE(struct icmpstat, icmpstat); /* icmp statistics. */
-#define V_icmpstat VNET_GET(icmpstat)
+#define V_icmpstat VNET(icmpstat)
extern int badport_bandlim(int);
#define BANDLIM_UNLIMITED -1
Modified: head/sys/netinet/if_ether.c
==============================================================================
--- head/sys/netinet/if_ether.c Thu Jul 16 20:29:36 2009 (r195726)
+++ head/sys/netinet/if_ether.c Thu Jul 16 21:13:04 2009 (r195727)
@@ -89,10 +89,10 @@ static VNET_DEFINE(int, useloopback) = 1
* local traffic */
static VNET_DEFINE(int, arp_proxyall);
-#define V_arpt_keep VNET_GET(arpt_keep)
-#define V_arp_maxtries VNET_GET(arp_maxtries)
-#define V_useloopback VNET_GET(useloopback)
-#define V_arp_proxyall VNET_GET(arp_proxyall)
+#define V_arpt_keep VNET(arpt_keep)
+#define V_arp_maxtries VNET(arp_maxtries)
+#define V_useloopback VNET(useloopback)
+#define V_arp_proxyall VNET(arp_proxyall)
SYSCTL_VNET_INT(_net_link_ether_inet, OID_AUTO, max_age, CTLFLAG_RW,
&VNET_NAME(arpt_keep), 0,
Modified: head/sys/netinet/igmp.c
==============================================================================
--- head/sys/netinet/igmp.c Thu Jul 16 20:29:36 2009 (r195726)
+++ head/sys/netinet/igmp.c Thu Jul 16 21:13:04 2009 (r195727)
@@ -219,17 +219,17 @@ static VNET_DEFINE(int, current_state_ti
* report; IGMPv3 g/sg
* query response */
-#define V_interface_timers_running
VNET_GET(interface_timers_running)
-#define V_state_change_timers_running
VNET_GET(state_change_timers_running)
-#define V_current_state_timers_running
VNET_GET(current_state_timers_running)
+#define V_interface_timers_running VNET(interface_timers_running)
+#define V_state_change_timers_running
VNET(state_change_timers_running)
+#define V_current_state_timers_running
VNET(current_state_timers_running)
static VNET_DEFINE(LIST_HEAD(, igmp_ifinfo), igi_head);
static VNET_DEFINE(struct igmpstat, igmpstat);
static VNET_DEFINE(struct timeval, igmp_gsrdelay) = {10, 0};
-#define V_igi_head VNET_GET(igi_head)
-#define V_igmpstat VNET_GET(igmpstat)
-#define V_igmp_gsrdelay VNET_GET(igmp_gsrdelay)
+#define V_igi_head VNET(igi_head)
+#define V_igmpstat VNET(igmpstat)
+#define V_igmp_gsrdelay VNET(igmp_gsrdelay)
static VNET_DEFINE(int, igmp_recvifkludge) = 1;
static VNET_DEFINE(int, igmp_sendra) = 1;
@@ -239,13 +239,13 @@ static VNET_DEFINE(int, igmp_v2enable) =
static VNET_DEFINE(int, igmp_legacysupp);
static VNET_DEFINE(int, igmp_default_version) = IGMP_VERSION_3;
-#define V_igmp_recvifkludge VNET_GET(igmp_recvifkludge)
-#define V_igmp_sendra VNET_GET(igmp_sendra)
-#define V_igmp_sendlocal VNET_GET(igmp_sendlocal)
-#define V_igmp_v1enable VNET_GET(igmp_v1enable)
-#define V_igmp_v2enable VNET_GET(igmp_v2enable)
-#define V_igmp_legacysupp VNET_GET(igmp_legacysupp)
-#define V_igmp_default_version VNET_GET(igmp_default_version)
+#define V_igmp_recvifkludge VNET(igmp_recvifkludge)
+#define V_igmp_sendra VNET(igmp_sendra)
+#define V_igmp_sendlocal VNET(igmp_sendlocal)
+#define V_igmp_v1enable VNET(igmp_v1enable)
+#define V_igmp_v2enable VNET(igmp_v2enable)
+#define V_igmp_legacysupp VNET(igmp_legacysupp)
+#define V_igmp_default_version VNET(igmp_default_version)
/*
* Virtualized sysctls.
Modified: head/sys/netinet/in.c
==============================================================================
--- head/sys/netinet/in.c Thu Jul 16 20:29:36 2009 (r195726)
+++ head/sys/netinet/in.c Thu Jul 16 21:13:04 2009 (r195727)
@@ -79,9 +79,9 @@ static VNET_DEFINE(int, subnetsarelocal)
static VNET_DEFINE(int, sameprefixcarponly);
VNET_DECLARE(struct inpcbinfo, ripcbinfo);
-#define V_subnetsarelocal VNET_GET(subnetsarelocal)
-#define V_sameprefixcarponly VNET_GET(sameprefixcarponly)
-#define V_ripcbinfo VNET_GET(ripcbinfo)
+#define V_subnetsarelocal VNET(subnetsarelocal)
+#define V_sameprefixcarponly VNET(sameprefixcarponly)
+#define V_ripcbinfo VNET(ripcbinfo)
SYSCTL_VNET_INT(_net_inet_ip, OID_AUTO, subnets_are_local, CTLFLAG_RW,
&VNET_NAME(subnetsarelocal), 0,
Modified: head/sys/netinet/in_pcb.c
==============================================================================
--- head/sys/netinet/in_pcb.c Thu Jul 16 20:29:36 2009 (r195726)
+++ head/sys/netinet/in_pcb.c Thu Jul 16 21:13:04 2009 (r195727)
@@ -110,7 +110,7 @@ VNET_DEFINE(int, ipport_stoprandom); /*
VNET_DEFINE(int, ipport_tcpallocs);
static VNET_DEFINE(int, ipport_tcplastcount);
-#define V_ipport_tcplastcount VNET_GET(ipport_tcplastcount)
+#define V_ipport_tcplastcount VNET(ipport_tcplastcount)
#define RANGECHK(var, min, max) \
if ((var) < (min)) { (var) = (min); } \
Modified: head/sys/netinet/in_pcb.h
==============================================================================
--- head/sys/netinet/in_pcb.h Thu Jul 16 20:29:36 2009 (r195726)
+++ head/sys/netinet/in_pcb.h Thu Jul 16 21:13:04 2009 (r195727)
@@ -465,19 +465,19 @@ VNET_DECLARE(int, ipport_randomtime);
VNET_DECLARE(int, ipport_stoprandom);
VNET_DECLARE(int, ipport_tcpallocs);
-#define V_ipport_reservedhigh VNET_GET(ipport_reservedhigh)
-#define V_ipport_reservedlow VNET_GET(ipport_reservedlow)
-#define V_ipport_lowfirstauto VNET_GET(ipport_lowfirstauto)
-#define V_ipport_lowlastauto VNET_GET(ipport_lowlastauto)
-#define V_ipport_firstauto VNET_GET(ipport_firstauto)
-#define V_ipport_lastauto VNET_GET(ipport_lastauto)
-#define V_ipport_hifirstauto VNET_GET(ipport_hifirstauto)
-#define V_ipport_hilastauto VNET_GET(ipport_hilastauto)
-#define V_ipport_randomized VNET_GET(ipport_randomized)
-#define V_ipport_randomcps VNET_GET(ipport_randomcps)
-#define V_ipport_randomtime VNET_GET(ipport_randomtime)
-#define V_ipport_stoprandom VNET_GET(ipport_stoprandom)
-#define V_ipport_tcpallocs VNET_GET(ipport_tcpallocs)
+#define V_ipport_reservedhigh VNET(ipport_reservedhigh)
+#define V_ipport_reservedlow VNET(ipport_reservedlow)
+#define V_ipport_lowfirstauto VNET(ipport_lowfirstauto)
+#define V_ipport_lowlastauto VNET(ipport_lowlastauto)
+#define V_ipport_firstauto VNET(ipport_firstauto)
+#define V_ipport_lastauto VNET(ipport_lastauto)
+#define V_ipport_hifirstauto VNET(ipport_hifirstauto)
+#define V_ipport_hilastauto VNET(ipport_hilastauto)
+#define V_ipport_randomized VNET(ipport_randomized)
+#define V_ipport_randomcps VNET(ipport_randomcps)
+#define V_ipport_randomtime VNET(ipport_randomtime)
+#define V_ipport_stoprandom VNET(ipport_stoprandom)
+#define V_ipport_tcpallocs VNET(ipport_tcpallocs)
extern struct callout ipport_tick_callout;
Modified: head/sys/netinet/in_rmx.c
==============================================================================
--- head/sys/netinet/in_rmx.c Thu Jul 16 20:29:36 2009 (r195726)
+++ head/sys/netinet/in_rmx.c Thu Jul 16 21:13:04 2009 (r195727)
@@ -135,9 +135,9 @@ static VNET_DEFINE(int, rtq_reallyold);
static VNET_DEFINE(int, rtq_minreallyold);
static VNET_DEFINE(int, rtq_toomany);
-#define V_rtq_reallyold VNET_GET(rtq_reallyold)
-#define V_rtq_minreallyold VNET_GET(rtq_minreallyold)
-#define V_rtq_toomany VNET_GET(rtq_toomany)
+#define V_rtq_reallyold VNET(rtq_reallyold)
+#define V_rtq_minreallyold VNET(rtq_minreallyold)
+#define V_rtq_toomany VNET(rtq_toomany)
SYSCTL_VNET_INT(_net_inet_ip, IPCTL_RTEXPIRE, rtexpire, CTLFLAG_RW,
&VNET_NAME(rtq_reallyold), 0,
@@ -242,8 +242,8 @@ in_rtqkill(struct radix_node *rn, void *
static VNET_DEFINE(int, rtq_timeout);
static VNET_DEFINE(struct callout, rtq_timer);
-#define V_rtq_timeout VNET_GET(rtq_timeout)
-#define V_rtq_timer VNET_GET(rtq_timer)
+#define V_rtq_timeout VNET(rtq_timeout)
+#define V_rtq_timer VNET(rtq_timer)
static void in_rtqtimo_one(void *rock);
Modified: head/sys/netinet/in_var.h
==============================================================================
--- head/sys/netinet/in_var.h Thu Jul 16 20:29:36 2009 (r195726)
+++ head/sys/netinet/in_var.h Thu Jul 16 21:13:04 2009 (r195727)
@@ -107,9 +107,9 @@ VNET_DECLARE(struct in_ifaddrhashhead *,
VNET_DECLARE(struct in_ifaddrhead, in_ifaddrhead);
VNET_DECLARE(u_long, in_ifaddrhmask); /* mask for hash table */
-#define V_in_ifaddrhashtbl VNET_GET(in_ifaddrhashtbl)
-#define V_in_ifaddrhead VNET_GET(in_ifaddrhead)
-#define V_in_ifaddrhmask VNET_GET(in_ifaddrhmask)
+#define V_in_ifaddrhashtbl VNET(in_ifaddrhashtbl)
+#define V_in_ifaddrhead VNET(in_ifaddrhead)
+#define V_in_ifaddrhmask VNET(in_ifaddrhmask)
#define INADDR_NHASH_LOG2 9
#define INADDR_NHASH (1 << INADDR_NHASH_LOG2)
Modified: head/sys/netinet/ip_divert.c
==============================================================================
--- head/sys/netinet/ip_divert.c Thu Jul 16 20:29:36 2009
(r195726)
+++ head/sys/netinet/ip_divert.c Thu Jul 16 21:13:04 2009
(r195727)
@@ -119,8 +119,8 @@ __FBSDID("$FreeBSD$");
static VNET_DEFINE(struct inpcbhead, divcb);
static VNET_DEFINE(struct inpcbinfo, divcbinfo);
-#define V_divcb VNET_GET(divcb)
-#define V_divcbinfo VNET_GET(divcbinfo)
+#define V_divcb VNET(divcb)
+#define V_divcbinfo VNET(divcbinfo)
static u_long div_sendspace = DIVSNDQ; /* XXX sysctl ? */
static u_long div_recvspace = DIVRCVQ; /* XXX sysctl ? */
Modified: head/sys/netinet/ip_fastfwd.c
==============================================================================
--- head/sys/netinet/ip_fastfwd.c Thu Jul 16 20:29:36 2009
(r195726)
+++ head/sys/netinet/ip_fastfwd.c Thu Jul 16 21:13:04 2009
(r195727)
@@ -107,7 +107,7 @@ __FBSDID("$FreeBSD$");
#include <machine/in_cksum.h>
static VNET_DEFINE(int, ipfastforward_active);
-#define V_ipfastforward_active VNET_GET(ipfastforward_active)
+#define V_ipfastforward_active VNET(ipfastforward_active)
SYSCTL_VNET_INT(_net_inet_ip, OID_AUTO, fastforwarding, CTLFLAG_RW,
&VNET_NAME(ipfastforward_active), 0, "Enable fast IP forwarding");
Modified: head/sys/netinet/ip_fw.h
==============================================================================
--- head/sys/netinet/ip_fw.h Thu Jul 16 20:29:36 2009 (r195726)
+++ head/sys/netinet/ip_fw.h Thu Jul 16 21:13:04 2009 (r195727)
@@ -653,12 +653,12 @@ void ipfw_nat_destroy(void);
VNET_DECLARE(int, fw_one_pass);
VNET_DECLARE(int, fw_enable);
-#define V_fw_one_pass VNET_GET(fw_one_pass)
-#define V_fw_enable VNET_GET(fw_enable)
+#define V_fw_one_pass VNET(fw_one_pass)
+#define V_fw_enable VNET(fw_enable)
#ifdef INET6
VNET_DECLARE(int, fw6_enable);
-#define V_fw6_enable VNET_GET(fw6_enable)
+#define V_fw6_enable VNET(fw6_enable)
#endif
struct ip_fw_chain {
@@ -695,7 +695,7 @@ typedef int ipfw_nat_cfg_t(struct sockop
#endif
VNET_DECLARE(struct ip_fw_chain, layer3_chain);
-#define V_layer3_chain VNET_GET(layer3_chain)
+#define V_layer3_chain VNET(layer3_chain)
#endif /* _KERNEL */
#endif /* _IPFW2_H */
Modified: head/sys/netinet/ip_icmp.c
==============================================================================
--- head/sys/netinet/ip_icmp.c Thu Jul 16 20:29:36 2009 (r195726)
+++ head/sys/netinet/ip_icmp.c Thu Jul 16 21:13:04 2009 (r195727)
@@ -89,16 +89,16 @@ static VNET_DEFINE(int, icmp_rfi);
static VNET_DEFINE(int, icmp_quotelen);
static VNET_DEFINE(int, icmpbmcastecho);
-#define V_icmpmaskrepl VNET_GET(icmpmaskrepl)
-#define V_icmpmaskfake VNET_GET(icmpmaskfake)
-#define V_drop_redirect VNET_GET(drop_redirect)
-#define V_log_redirect VNET_GET(log_redirect)
-#define V_icmplim VNET_GET(icmplim)
-#define V_icmplim_output VNET_GET(icmplim_output)
-#define V_reply_src VNET_GET(reply_src)
-#define V_icmp_rfi VNET_GET(icmp_rfi)
-#define V_icmp_quotelen VNET_GET(icmp_quotelen)
-#define V_icmpbmcastecho VNET_GET(icmpbmcastecho)
+#define V_icmpmaskrepl VNET(icmpmaskrepl)
+#define V_icmpmaskfake VNET(icmpmaskfake)
+#define V_drop_redirect VNET(drop_redirect)
+#define V_log_redirect VNET(log_redirect)
+#define V_icmplim VNET(icmplim)
+#define V_icmplim_output VNET(icmplim_output)
+#define V_reply_src VNET(reply_src)
+#define V_icmp_rfi VNET(icmp_rfi)
+#define V_icmp_quotelen VNET(icmp_quotelen)
+#define V_icmpbmcastecho VNET(icmpbmcastecho)
SYSCTL_VNET_STRUCT(_net_inet_icmp, ICMPCTL_STATS, stats, CTLFLAG_RW,
&VNET_NAME(icmpstat), icmpstat, "");
Modified: head/sys/netinet/ip_input.c
==============================================================================
--- head/sys/netinet/ip_input.c Thu Jul 16 20:29:36 2009 (r195726)
+++ head/sys/netinet/ip_input.c Thu Jul 16 21:13:04 2009 (r195727)
@@ -95,10 +95,10 @@ static VNET_DEFINE(int, ip_checkinterfac
static VNET_DEFINE(int, ip_keepfaith);
static VNET_DEFINE(int, ip_sendsourcequench);
-#define V_ipsendredirects VNET_GET(ipsendredirects)
-#define V_ip_checkinterface VNET_GET(ip_checkinterface)
-#define V_ip_keepfaith VNET_GET(ip_keepfaith)
-#define V_ip_sendsourcequench VNET_GET(ip_sendsourcequench)
+#define V_ipsendredirects VNET(ipsendredirects)
+#define V_ip_checkinterface VNET(ip_checkinterface)
+#define V_ip_keepfaith VNET(ip_keepfaith)
+#define V_ip_sendsourcequench VNET(ip_sendsourcequench)
VNET_DEFINE(int, ip_defttl) = IPDEFTTL;
VNET_DEFINE(int, ip_do_randomid);
@@ -113,17 +113,17 @@ static VNET_DEFINE(int, ip_rsvp_on);
VNET_DEFINE(struct socket *, ip_rsvpd);
VNET_DEFINE(int, rsvp_on);
-#define V_ip_rsvp_on VNET_GET(ip_rsvp_on)
+#define V_ip_rsvp_on VNET(ip_rsvp_on)
static VNET_DEFINE(TAILQ_HEAD(ipqhead, ipq), ipq[IPREASS_NHASH]);
static VNET_DEFINE(int, maxnipq); /* Administrative limit on # reass queues.
*/
static VNET_DEFINE(int, maxfragsperpacket);
static VNET_DEFINE(int, nipq); /* Total # of reass queues */
-#define V_ipq VNET_GET(ipq)
-#define V_maxnipq VNET_GET(maxnipq)
-#define V_maxfragsperpacket VNET_GET(maxfragsperpacket)
-#define V_nipq VNET_GET(nipq)
+#define V_ipq VNET(ipq)
+#define V_maxnipq VNET(maxnipq)
+#define V_maxfragsperpacket VNET(maxfragsperpacket)
+#define V_nipq VNET(nipq)
VNET_DEFINE(int, ipstealth);
@@ -189,7 +189,7 @@ SYSCTL_VNET_STRUCT(_net_inet_ip, IPCTL_S
"IP statistics (struct ipstat, netinet/ip_var.h)");
static VNET_DEFINE(uma_zone_t, ipq_zone);
-#define V_ipq_zone VNET_GET(ipq_zone)
+#define V_ipq_zone VNET(ipq_zone)
static struct mtx ipqlock;
@@ -225,7 +225,7 @@ SYSCTL_VNET_INT(_net_inet_ip, OID_AUTO,
#ifdef FLOWTABLE
static VNET_DEFINE(int, ip_output_flowtable_size) = 2048;
VNET_DEFINE(struct flowtable *, ip_ft);
-#define V_ip_output_flowtable_size
VNET_GET(ip_output_flowtable_size)
+#define V_ip_output_flowtable_size VNET(ip_output_flowtable_size)
SYSCTL_VNET_INT(_net_inet_ip, OID_AUTO, output_flowtable_size, CTLFLAG_RDTUN,
&VNET_NAME(ip_output_flowtable_size), 2048,
Modified: head/sys/netinet/ip_ipsec.c
==============================================================================
--- head/sys/netinet/ip_ipsec.c Thu Jul 16 20:29:36 2009 (r195726)
+++ head/sys/netinet/ip_ipsec.c Thu Jul 16 21:13:04 2009 (r195727)
@@ -77,7 +77,7 @@ static VNET_DEFINE(int, ip4_ipsec_filter
#else
static VNET_DEFINE(int, ip4_ipsec_filtertunnel) = 0;
#endif
-#define V_ip4_ipsec_filtertunnel VNET_GET(ip4_ipsec_filtertunnel)
+#define V_ip4_ipsec_filtertunnel VNET(ip4_ipsec_filtertunnel)
SYSCTL_DECL(_net_inet_ipsec);
SYSCTL_VNET_INT(_net_inet_ipsec, OID_AUTO, filtertunnel,
Modified: head/sys/netinet/ip_var.h
==============================================================================
--- head/sys/netinet/ip_var.h Thu Jul 16 20:29:36 2009 (r195726)
+++ head/sys/netinet/ip_var.h Thu Jul 16 21:13:04 2009 (r195727)
@@ -171,16 +171,16 @@ VNET_DECLARE(int, rsvp_on);
VNET_DECLARE(struct socket *, ip_rsvpd); /* reservation protocol daemon*/
VNET_DECLARE(struct socket *, ip_mrouter); /* multicast routing daemon */
-#define V_ipstat VNET_GET(ipstat)
-#define V_ip_id VNET_GET(ip_id)
-#define V_ip_defttl VNET_GET(ip_defttl)
-#define V_ipforwarding VNET_GET(ipforwarding)
+#define V_ipstat VNET(ipstat)
+#define V_ip_id VNET(ip_id)
+#define V_ip_defttl VNET(ip_defttl)
+#define V_ipforwarding VNET(ipforwarding)
#ifdef IPSTEALTH
-#define V_ipstealth VNET_GET(ipstealth)
+#define V_ipstealth VNET(ipstealth)
#endif
-#define V_rsvp_on VNET_GET(rsvp_on)
-#define V_ip_rsvpd VNET_GET(ip_rsvpd)
-#define V_ip_mrouter VNET_GET(ip_mrouter)
+#define V_rsvp_on VNET(rsvp_on)
+#define V_ip_rsvpd VNET(ip_rsvpd)
+#define V_ip_mrouter VNET(ip_mrouter)
extern u_char ip_protox[];
extern int (*legal_vif_num)(int);
@@ -243,7 +243,7 @@ extern int (*ip_dn_io_ptr)(struct mbuf *
extern void (*ip_dn_ruledel_ptr)(void *); /* in ip_fw2.c */
VNET_DECLARE(int, ip_do_randomid);
-#define V_ip_do_randomid VNET_GET(ip_do_randomid)
+#define V_ip_do_randomid VNET(ip_do_randomid)
#define ip_newid() ((V_ip_do_randomid != 0) ? ip_randomid() : \
htons(V_ip_id++))
Modified: head/sys/netinet/ipfw/ip_fw2.c
==============================================================================
--- head/sys/netinet/ipfw/ip_fw2.c Thu Jul 16 20:29:36 2009
(r195726)
+++ head/sys/netinet/ipfw/ip_fw2.c Thu Jul 16 21:13:04 2009
(r195727)
@@ -116,10 +116,10 @@ static VNET_DEFINE(int, fw_verbose);
static VNET_DEFINE(struct callout, ipfw_timeout);
static VNET_DEFINE(int, verbose_limit);
-#define V_set_disable VNET_GET(set_disable)
-#define V_fw_verbose VNET_GET(fw_verbose)
-#define V_ipfw_timeout VNET_GET(ipfw_timeout)
-#define V_verbose_limit VNET_GET(verbose_limit)
+#define V_set_disable VNET(set_disable)
+#define V_fw_verbose VNET(fw_verbose)
+#define V_ipfw_timeout VNET(ipfw_timeout)
+#define V_verbose_limit VNET(verbose_limit)
#ifdef IPFIREWALL_DEFAULT_TO_ACCEPT
static int default_to_accept = 1;
@@ -151,7 +151,7 @@ struct table_entry {
};
static VNET_DEFINE(int, autoinc_step);
-#define V_autoinc_step VNET_GET(autoinc_step)
+#define V_autoinc_step VNET(autoinc_step)
extern int ipfw_chg_hook(SYSCTL_HANDLER_ARGS);
@@ -220,9 +220,9 @@ static VNET_DEFINE(ipfw_dyn_rule **, ipf
static VNET_DEFINE(u_int32_t, dyn_buckets);
static VNET_DEFINE(u_int32_t, curr_dyn_buckets);
-#define V_ipfw_dyn_v VNET_GET(ipfw_dyn_v)
-#define V_dyn_buckets VNET_GET(dyn_buckets)
-#define V_curr_dyn_buckets VNET_GET(curr_dyn_buckets)
+#define V_ipfw_dyn_v VNET(ipfw_dyn_v)
+#define V_dyn_buckets VNET(dyn_buckets)
+#define V_curr_dyn_buckets VNET(curr_dyn_buckets)
static struct mtx ipfw_dyn_mtx; /* mutex guarding dynamic rules
*/
#define IPFW_DYN_LOCK_INIT() \
@@ -242,12 +242,12 @@ static VNET_DEFINE(u_int32_t, dyn_rst_li
static VNET_DEFINE(u_int32_t, dyn_udp_lifetime);
static VNET_DEFINE(u_int32_t, dyn_short_lifetime);
-#define V_dyn_ack_lifetime VNET_GET(dyn_ack_lifetime)
-#define V_dyn_syn_lifetime VNET_GET(dyn_syn_lifetime)
-#define V_dyn_fin_lifetime VNET_GET(dyn_fin_lifetime)
-#define V_dyn_rst_lifetime VNET_GET(dyn_rst_lifetime)
-#define V_dyn_udp_lifetime VNET_GET(dyn_udp_lifetime)
-#define V_dyn_short_lifetime VNET_GET(dyn_short_lifetime)
+#define V_dyn_ack_lifetime VNET(dyn_ack_lifetime)
+#define V_dyn_syn_lifetime VNET(dyn_syn_lifetime)
+#define V_dyn_fin_lifetime VNET(dyn_fin_lifetime)
+#define V_dyn_rst_lifetime VNET(dyn_rst_lifetime)
+#define V_dyn_udp_lifetime VNET(dyn_udp_lifetime)
+#define V_dyn_short_lifetime VNET(dyn_short_lifetime)
/*
* Keepalives are sent if dyn_keepalive is set. They are sent every
@@ -261,19 +261,19 @@ static VNET_DEFINE(u_int32_t, dyn_keepal
static VNET_DEFINE(u_int32_t, dyn_keepalive_period);
static VNET_DEFINE(u_int32_t, dyn_keepalive);
-#define V_dyn_keepalive_interval VNET_GET(dyn_keepalive_interval)
-#define V_dyn_keepalive_period VNET_GET(dyn_keepalive_period)
-#define V_dyn_keepalive VNET_GET(dyn_keepalive)
+#define V_dyn_keepalive_interval VNET(dyn_keepalive_interval)
+#define V_dyn_keepalive_period VNET(dyn_keepalive_period)
+#define V_dyn_keepalive VNET(dyn_keepalive)
static VNET_DEFINE(u_int32_t, static_count); /* # of static rules */
static VNET_DEFINE(u_int32_t, static_len); /* bytes of static rules */
static VNET_DEFINE(u_int32_t, dyn_count); /* # of dynamic rules */
static VNET_DEFINE(u_int32_t, dyn_max); /* max # of dynamic
rules */
-#define V_static_count VNET_GET(static_count)
-#define V_static_len VNET_GET(static_len)
-#define V_dyn_count VNET_GET(dyn_count)
-#define V_dyn_max VNET_GET(dyn_max)
+#define V_static_count VNET(static_count)
+#define V_static_len VNET(static_len)
+#define V_dyn_count VNET(dyn_count)
+#define V_dyn_max VNET(dyn_max)
#ifdef SYSCTL_NODE
SYSCTL_VNET_INT(_net_inet_ip_fw, OID_AUTO, dyn_buckets,
@@ -323,7 +323,7 @@ static struct sysctl_oid *ip6_fw_sysctl_
#endif /* INET6 */
static VNET_DEFINE(int, fw_deny_unknown_exthdrs);
-#define V_fw_deny_unknown_exthdrs
VNET_GET(fw_deny_unknown_exthdrs)
+#define V_fw_deny_unknown_exthdrs VNET(fw_deny_unknown_exthdrs)
/*
* L3HDR maps an ipv4 pointer into a layer3 header pointer of type T
@@ -780,7 +780,7 @@ send_reject6(struct ip_fw_args *args, in
/* counter for ipfw_log(NULL...) */
static VNET_DEFINE(u_int64_t, norule_counter);
-#define V_norule_counter VNET_GET(norule_counter)
+#define V_norule_counter VNET(norule_counter)
#define SNPARGS(buf, len) buf + len, sizeof(buf) > len ? sizeof(buf) - len : 0
#define SNP(buf) buf, sizeof(buf)
Modified: head/sys/netinet/ipfw/ip_fw_nat.c
==============================================================================
--- head/sys/netinet/ipfw/ip_fw_nat.c Thu Jul 16 20:29:36 2009
(r195726)
+++ head/sys/netinet/ipfw/ip_fw_nat.c Thu Jul 16 21:13:04 2009
(r195727)
@@ -70,7 +70,7 @@ __FBSDID("$FreeBSD$");
MALLOC_DECLARE(M_IPFW);
static VNET_DEFINE(eventhandler_tag, ifaddr_event_tag);
-#define V_ifaddr_event_tag VNET_GET(ifaddr_event_tag)
+#define V_ifaddr_event_tag VNET(ifaddr_event_tag)
extern ipfw_nat_t *ipfw_nat_ptr;
extern ipfw_nat_cfg_t *ipfw_nat_cfg_ptr;
Modified: head/sys/netinet/raw_ip.c
==============================================================================
--- head/sys/netinet/raw_ip.c Thu Jul 16 20:29:36 2009 (r195726)
+++ head/sys/netinet/raw_ip.c Thu Jul 16 21:13:04 2009 (r195727)
@@ -77,8 +77,8 @@ __FBSDID("$FreeBSD$");
VNET_DEFINE(struct inpcbhead, ripcb);
VNET_DEFINE(struct inpcbinfo, ripcbinfo);
-#define V_ripcb VNET_GET(ripcb)
-#define V_ripcbinfo VNET_GET(ripcbinfo)
+#define V_ripcb VNET(ripcb)
+#define V_ripcbinfo VNET(ripcbinfo)
/*
* Control and data hooks for ipfw and dummynet.
Modified: head/sys/netinet/tcp_hostcache.c
==============================================================================
--- head/sys/netinet/tcp_hostcache.c Thu Jul 16 20:29:36 2009
(r195726)
+++ head/sys/netinet/tcp_hostcache.c Thu Jul 16 21:13:04 2009
(r195727)
@@ -109,8 +109,8 @@ __FBSDID("$FreeBSD$");
static VNET_DEFINE(struct tcp_hostcache, tcp_hostcache);
static VNET_DEFINE(struct callout, tcp_hc_callout);
-#define V_tcp_hostcache VNET_GET(tcp_hostcache)
-#define V_tcp_hc_callout VNET_GET(tcp_hc_callout)
+#define V_tcp_hostcache VNET(tcp_hostcache)
+#define V_tcp_hc_callout VNET(tcp_hc_callout)
static struct hc_metrics *tcp_hc_lookup(struct in_conninfo *);
static struct hc_metrics *tcp_hc_insert(struct in_conninfo *);
Modified: head/sys/netinet/tcp_reass.c
==============================================================================
--- head/sys/netinet/tcp_reass.c Thu Jul 16 20:29:36 2009
(r195726)
+++ head/sys/netinet/tcp_reass.c Thu Jul 16 21:13:04 2009
(r195727)
@@ -79,9 +79,9 @@ VNET_DEFINE(int, tcp_reass_qsize);
static VNET_DEFINE(int, tcp_reass_maxqlen);
static VNET_DEFINE(int, tcp_reass_overflows);
-#define V_tcp_reass_maxseg VNET_GET(tcp_reass_maxseg)
-#define V_tcp_reass_maxqlen VNET_GET(tcp_reass_maxqlen)
-#define V_tcp_reass_overflows VNET_GET(tcp_reass_overflows)
+#define V_tcp_reass_maxseg VNET(tcp_reass_maxseg)
+#define V_tcp_reass_maxqlen VNET(tcp_reass_maxqlen)
+#define V_tcp_reass_overflows VNET(tcp_reass_overflows)
SYSCTL_NODE(_net_inet_tcp, OID_AUTO, reass, CTLFLAG_RW, 0,
"TCP Segment Reassembly Queue");
Modified: head/sys/netinet/tcp_sack.c
==============================================================================
--- head/sys/netinet/tcp_sack.c Thu Jul 16 20:29:36 2009 (r195726)
+++ head/sys/netinet/tcp_sack.c Thu Jul 16 21:13:04 2009 (r195727)
@@ -128,11 +128,11 @@ VNET_DEFINE(int, tcp_sack_maxholes);
VNET_DEFINE(int, tcp_sack_globalmaxholes);
VNET_DEFINE(int, tcp_sack_globalholes);
-#define V_sack_hole_zone VNET_GET(sack_hole_zone)
-#define V_tcp_do_sack VNET_GET(tcp_do_sack)
-#define V_tcp_sack_maxholes VNET_GET(tcp_sack_maxholes)
-#define V_tcp_sack_globalmaxholes
VNET_GET(tcp_sack_globalmaxholes)
-#define V_tcp_sack_globalholes VNET_GET(tcp_sack_globalholes)
+#define V_sack_hole_zone VNET(sack_hole_zone)
+#define V_tcp_do_sack VNET(tcp_do_sack)
+#define V_tcp_sack_maxholes VNET(tcp_sack_maxholes)
+#define V_tcp_sack_globalmaxholes VNET(tcp_sack_globalmaxholes)
+#define V_tcp_sack_globalholes VNET(tcp_sack_globalholes)
SYSCTL_NODE(_net_inet_tcp, OID_AUTO, sack, CTLFLAG_RW, 0, "TCP SACK");
SYSCTL_VNET_INT(_net_inet_tcp_sack, OID_AUTO, enable, CTLFLAG_RW,
Modified: head/sys/netinet/tcp_subr.c
==============================================================================
--- head/sys/netinet/tcp_subr.c Thu Jul 16 20:29:36 2009 (r195726)
+++ head/sys/netinet/tcp_subr.c Thu Jul 16 21:13:04 2009 (r195727)
@@ -126,13 +126,13 @@ static VNET_DEFINE(int, tcp_inflight_min
static VNET_DEFINE(int, tcp_inflight_max);
static VNET_DEFINE(int, tcp_inflight_stab);
-#define V_icmp_may_rst VNET_GET(icmp_may_rst)
-#define V_tcp_isn_reseed_interval
VNET_GET(tcp_isn_reseed_interval)
-#define V_tcp_inflight_enable VNET_GET(tcp_inflight_enable)
-#define V_tcp_inflight_rttthresh VNET_GET(tcp_inflight_rttthresh)
-#define V_tcp_inflight_min VNET_GET(tcp_inflight_min)
-#define V_tcp_inflight_max VNET_GET(tcp_inflight_max)
-#define V_tcp_inflight_stab VNET_GET(tcp_inflight_stab)
+#define V_icmp_may_rst VNET(icmp_may_rst)
+#define V_tcp_isn_reseed_interval VNET(tcp_isn_reseed_interval)
+#define V_tcp_inflight_enable VNET(tcp_inflight_enable)
+#define V_tcp_inflight_rttthresh VNET(tcp_inflight_rttthresh)
+#define V_tcp_inflight_min VNET(tcp_inflight_min)
+#define V_tcp_inflight_max VNET(tcp_inflight_max)
+#define V_tcp_inflight_stab VNET(tcp_inflight_stab)
static int
sysctl_net_inet_tcp_mss_check(SYSCTL_HANDLER_ARGS)
@@ -252,7 +252,7 @@ SYSCTL_VNET_INT(_net_inet_tcp_inflight,
"Inflight Algorithm Stabilization 20 = 2 packets");
VNET_DEFINE(uma_zone_t, sack_hole_zone);
-#define V_sack_hole_zone VNET_GET(sack_hole_zone)
+#define V_sack_hole_zone VNET(sack_hole_zone)
static struct inpcb *tcp_notify(struct inpcb *, int);
static void tcp_isn_tick(void *);
@@ -279,7 +279,7 @@ struct tcpcb_mem {
};
static VNET_DEFINE(uma_zone_t, tcpcb_zone);
-#define V_tcpcb_zone VNET_GET(tcpcb_zone)
+#define V_tcpcb_zone VNET(tcpcb_zone)
MALLOC_DEFINE(M_TCPLOG, "tcplog", "TCP address and flags print buffers");
struct callout isn_callout;
@@ -1514,10 +1514,10 @@ static VNET_DEFINE(int, isn_last_reseed)
static VNET_DEFINE(u_int32_t, isn_offset);
static VNET_DEFINE(u_int32_t, isn_offset_old);
-#define V_isn_secret VNET_GET(isn_secret)
-#define V_isn_last_reseed VNET_GET(isn_last_reseed)
-#define V_isn_offset VNET_GET(isn_offset)
-#define V_isn_offset_old VNET_GET(isn_offset_old)
+#define V_isn_secret VNET(isn_secret)
+#define V_isn_last_reseed VNET(isn_last_reseed)
+#define V_isn_offset VNET(isn_offset)
+#define V_isn_offset_old VNET(isn_offset_old)
tcp_seq
tcp_new_isn(struct tcpcb *tp)
Modified: head/sys/netinet/tcp_syncache.c
==============================================================================
--- head/sys/netinet/tcp_syncache.c Thu Jul 16 20:29:36 2009
(r195726)
+++ head/sys/netinet/tcp_syncache.c Thu Jul 16 21:13:04 2009
(r195727)
@@ -103,9 +103,9 @@ static VNET_DEFINE(int, tcp_syncookies);
static VNET_DEFINE(int, tcp_syncookiesonly);
VNET_DEFINE(int, tcp_sc_rst_sock_fail);
-#define V_tcp_syncache VNET_GET(tcp_syncache)
-#define V_tcp_syncookies VNET_GET(tcp_syncookies)
-#define V_tcp_syncookiesonly VNET_GET(tcp_syncookiesonly)
+#define V_tcp_syncache VNET(tcp_syncache)
+#define V_tcp_syncookies VNET(tcp_syncookies)
+#define V_tcp_syncookiesonly VNET(tcp_syncookiesonly)
SYSCTL_VNET_INT(_net_inet_tcp, OID_AUTO, syncookies, CTLFLAG_RW,
&VNET_NAME(tcp_syncookies), 0,
Modified: head/sys/netinet/tcp_timewait.c
==============================================================================
--- head/sys/netinet/tcp_timewait.c Thu Jul 16 20:29:36 2009
(r195726)
+++ head/sys/netinet/tcp_timewait.c Thu Jul 16 21:13:04 2009
(r195727)
@@ -104,8 +104,8 @@ static VNET_DEFINE(uma_zone_t, tcptw_zon
static VNET_DEFINE(TAILQ_HEAD(, tcptw), twq_2msl);
VNET_DEFINE(int, nolocaltimewait);
-#define V_tcptw_zone VNET_GET(tcptw_zone)
-#define V_twq_2msl VNET_GET(twq_2msl)
+#define V_tcptw_zone VNET(tcptw_zone)
+#define V_twq_2msl VNET(twq_2msl)
static void tcp_tw_2msl_reset(struct tcptw *, int);
static void tcp_tw_2msl_stop(struct tcptw *);
Modified: head/sys/netinet/tcp_var.h
==============================================================================
--- head/sys/netinet/tcp_var.h Thu Jul 16 20:29:36 2009 (r195726)
+++ head/sys/netinet/tcp_var.h Thu Jul 16 21:13:04 2009 (r195727)
@@ -44,9 +44,9 @@
VNET_DECLARE(int, tcp_do_rfc1323);
VNET_DECLARE(int, tcp_reass_qsize);
VNET_DECLARE(struct uma_zone *, tcp_reass_zone);
-#define V_tcp_do_rfc1323 VNET_GET(tcp_do_rfc1323)
-#define V_tcp_reass_qsize VNET_GET(tcp_reass_qsize)
-#define V_tcp_reass_zone VNET_GET(tcp_reass_zone)
+#define V_tcp_do_rfc1323 VNET(tcp_do_rfc1323)
+#define V_tcp_reass_qsize VNET(tcp_reass_qsize)
+#define V_tcp_reass_zone VNET(tcp_reass_zone)
#endif /* _KERNEL */
@@ -551,16 +551,16 @@ VNET_DECLARE(int, path_mtu_discovery);
VNET_DECLARE(int, ss_fltsz);
VNET_DECLARE(int, ss_fltsz_local);
-#define V_tcb VNET_GET(tcb)
-#define V_tcbinfo VNET_GET(tcbinfo)
-#define V_tcpstat VNET_GET(tcpstat)
-#define V_tcp_mssdflt VNET_GET(tcp_mssdflt)
-#define V_tcp_minmss VNET_GET(tcp_minmss)
-#define V_tcp_delack_enabled VNET_GET(tcp_delack_enabled)
-#define V_tcp_do_newreno VNET_GET(tcp_do_newreno)
-#define V_path_mtu_discovery VNET_GET(path_mtu_discovery)
-#define V_ss_fltsz VNET_GET(ss_fltsz)
-#define V_ss_fltsz_local VNET_GET(ss_fltsz_local)
+#define V_tcb VNET(tcb)
+#define V_tcbinfo VNET(tcbinfo)
+#define V_tcpstat VNET(tcpstat)
+#define V_tcp_mssdflt VNET(tcp_mssdflt)
+#define V_tcp_minmss VNET(tcp_minmss)
+#define V_tcp_delack_enabled VNET(tcp_delack_enabled)
+#define V_tcp_do_newreno VNET(tcp_do_newreno)
+#define V_path_mtu_discovery VNET(path_mtu_discovery)
+#define V_ss_fltsz VNET(ss_fltsz)
+#define V_ss_fltsz_local VNET(ss_fltsz_local)
VNET_DECLARE(int, blackhole);
VNET_DECLARE(int, drop_synfin);
@@ -573,30 +573,30 @@ VNET_DECLARE(int, tcp_autorcvbuf_max);
VNET_DECLARE(int, tcp_do_rfc3465);
VNET_DECLARE(int, tcp_abc_l_var);
-#define V_blackhole VNET_GET(blackhole)
-#define V_drop_synfin VNET_GET(drop_synfin)
-#define V_tcp_do_rfc3042 VNET_GET(tcp_do_rfc3042)
-#define V_tcp_do_rfc3390 VNET_GET(tcp_do_rfc3390)
-#define V_tcp_insecure_rst VNET_GET(tcp_insecure_rst)
-#define V_tcp_do_autorcvbuf VNET_GET(tcp_do_autorcvbuf)
-#define V_tcp_autorcvbuf_inc VNET_GET(tcp_autorcvbuf_inc)
-#define V_tcp_autorcvbuf_max VNET_GET(tcp_autorcvbuf_max)
-#define V_tcp_do_rfc3465 VNET_GET(tcp_do_rfc3465)
-#define V_tcp_abc_l_var VNET_GET(tcp_abc_l_var)
+#define V_blackhole VNET(blackhole)
+#define V_drop_synfin VNET(drop_synfin)
+#define V_tcp_do_rfc3042 VNET(tcp_do_rfc3042)
+#define V_tcp_do_rfc3390 VNET(tcp_do_rfc3390)
+#define V_tcp_insecure_rst VNET(tcp_insecure_rst)
+#define V_tcp_do_autorcvbuf VNET(tcp_do_autorcvbuf)
+#define V_tcp_autorcvbuf_inc VNET(tcp_autorcvbuf_inc)
+#define V_tcp_autorcvbuf_max VNET(tcp_autorcvbuf_max)
+#define V_tcp_do_rfc3465 VNET(tcp_do_rfc3465)
+#define V_tcp_abc_l_var VNET(tcp_abc_l_var)
VNET_DECLARE(int, tcp_do_tso);
VNET_DECLARE(int, tcp_do_autosndbuf);
VNET_DECLARE(int, tcp_autosndbuf_inc);
VNET_DECLARE(int, tcp_autosndbuf_max);
-#define V_tcp_do_tso VNET_GET(tcp_do_tso)
-#define V_tcp_do_autosndbuf VNET_GET(tcp_do_autosndbuf)
-#define V_tcp_autosndbuf_inc VNET_GET(tcp_autosndbuf_inc)
-#define V_tcp_autosndbuf_max VNET_GET(tcp_autosndbuf_max)
+#define V_tcp_do_tso VNET(tcp_do_tso)
+#define V_tcp_do_autosndbuf VNET(tcp_do_autosndbuf)
+#define V_tcp_autosndbuf_inc VNET(tcp_autosndbuf_inc)
+#define V_tcp_autosndbuf_max VNET(tcp_autosndbuf_max)
VNET_DECLARE(int, nolocaltimewait);
-#define V_nolocaltimewait VNET_GET(nolocaltimewait)
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
