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)

28 files changed, 177 insertions, 177 deletions

diff --git a/sys/netinet/icmp6.h b/sys/netinet/icmp6.h
index 32e3e9f..7dc22e5 100644
--- a/sys/netinet/icmp6.h
+++ b/sys/netinet/icmp6.h
@@ -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
diff --git a/sys/netinet/icmp_var.h b/sys/netinet/icmp_var.h
index 8be07b8..4d70ada 100644
--- a/sys/netinet/icmp_var.h
+++ b/sys/netinet/icmp_var.h
@@ -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
diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c
index bf5f124..6b6b5e6 100644
--- a/sys/netinet/if_ether.c
+++ b/sys/netinet/if_ether.c
@@ -89,10 +89,10 @@ static VNET_DEFINE(int, useloopback) = 1;	/* use loopback interface for
 						 * 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,
diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c
index c8bd09a..37cc1b3 100644
--- a/sys/netinet/igmp.c
+++ b/sys/netinet/igmp.c
@@ -219,17 +219,17 @@ static VNET_DEFINE(int, current_state_timers_running);	/* IGMPv1/v2 host
 							 * 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) = 1;
 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.
diff --git a/sys/netinet/in.c b/sys/netinet/in.c
index 8b7eab6..a606562 100644
--- a/sys/netinet/in.c
+++ b/sys/netinet/in.c
@@ -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,
diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c
index 58bf77a..94906ad 100644
--- a/sys/netinet/in_pcb.c
+++ b/sys/netinet/in_pcb.c
@@ -110,7 +110,7 @@ VNET_DEFINE(int, ipport_stoprandom);		/* toggled by ipport_tick */
 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); } \
diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h
index d8ac3bf..9d5bbe7 100644
--- a/sys/netinet/in_pcb.h
+++ b/sys/netinet/in_pcb.h
@@ -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;
 
diff --git a/sys/netinet/in_rmx.c b/sys/netinet/in_rmx.c
index d391871..2ef4ed6 100644
--- a/sys/netinet/in_rmx.c
+++ b/sys/netinet/in_rmx.c
@@ -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 *rock)
 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);
 
diff --git a/sys/netinet/in_var.h b/sys/netinet/in_var.h
index 9a7cfb5..cd1d904 100644
--- a/sys/netinet/in_var.h
+++ b/sys/netinet/in_var.h
@@ -107,9 +107,9 @@ VNET_DECLARE(struct in_ifaddrhashhead *, in_ifaddrhashtbl);
 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)
diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c
index 86ec9fc..6abf76f 100644
--- a/sys/netinet/ip_divert.c
+++ b/sys/netinet/ip_divert.c
@@ -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 ? */
diff --git a/sys/netinet/ip_fastfwd.c b/sys/netinet/ip_fastfwd.c
index 2207cc4..1c83706 100644
--- a/sys/netinet/ip_fastfwd.c
+++ b/sys/netinet/ip_fastfwd.c
@@ -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");
diff --git a/sys/netinet/ip_fw.h b/sys/netinet/ip_fw.h
index 609ac4c..18920a0 100644
--- a/sys/netinet/ip_fw.h
+++ b/sys/netinet/ip_fw.h
@@ -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 sockopt *);
 #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 */
diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c
index 475f297..57a1292 100644
--- a/sys/netinet/ip_icmp.c
+++ b/sys/netinet/ip_icmp.c
@@ -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, "");
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index 11ab3c7..8e84707 100644
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -95,10 +95,10 @@ static VNET_DEFINE(int, ip_checkinterface);
 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_STATS, stats, CTLFLAG_RW,
     "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, stealth, CTLFLAG_RW,
 #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,
diff --git a/sys/netinet/ip_ipsec.c b/sys/netinet/ip_ipsec.c
index da34d77..f0d4a5f 100644
--- a/sys/netinet/ip_ipsec.c
+++ b/sys/netinet/ip_ipsec.c
@@ -77,7 +77,7 @@ static VNET_DEFINE(int, ip4_ipsec_filtertunnel) = 1;
 #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,
diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h
index 0db34d2..74aecb1 100644
--- a/sys/netinet/ip_var.h
+++ b/sys/netinet/ip_var.h
@@ -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 **m, int dir, struct ip_fw_args *fwa);
 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++))
 
diff --git a/sys/netinet/ipfw/ip_fw2.c b/sys/netinet/ipfw/ip_fw2.c
index 95efc2b..b1e8480 100644
--- a/sys/netinet/ipfw/ip_fw2.c
+++ b/sys/netinet/ipfw/ip_fw2.c
@@ -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 **, ipfw_dyn_v);
 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_lifetime);
 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_keepalive_interval);
 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_tree;
 #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, int code, u_int hlen, struct ip6_hdr *ip6)
 
 /* 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)
diff --git a/sys/netinet/ipfw/ip_fw_nat.c b/sys/netinet/ipfw/ip_fw_nat.c
index 9ba2f5f..ac7cc44 100644
--- a/sys/netinet/ipfw/ip_fw_nat.c
+++ b/sys/netinet/ipfw/ip_fw_nat.c
@@ -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;
diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c
index c3a0a74..517ac8e 100644
--- a/sys/netinet/raw_ip.c
+++ b/sys/netinet/raw_ip.c
@@ -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.
diff --git a/sys/netinet/tcp_hostcache.c b/sys/netinet/tcp_hostcache.c
index e7bf0d1..2d3d922 100644
--- a/sys/netinet/tcp_hostcache.c
+++ b/sys/netinet/tcp_hostcache.c
@@ -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 *);
diff --git a/sys/netinet/tcp_reass.c b/sys/netinet/tcp_reass.c
index 88ef391..fa844b6 100644
--- a/sys/netinet/tcp_reass.c
+++ b/sys/netinet/tcp_reass.c
@@ -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");
diff --git a/sys/netinet/tcp_sack.c b/sys/netinet/tcp_sack.c
index defc9eb..985eee8 100644
--- a/sys/netinet/tcp_sack.c
+++ b/sys/netinet/tcp_sack.c
@@ -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,
diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c
index 7839cfa..df61a00 100644
--- a/sys/netinet/tcp_subr.c
+++ b/sys/netinet/tcp_subr.c
@@ -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, OID_AUTO, stab, CTLFLAG_RW,
     "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)
diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c
index 9a7ce79..65c1d51 100644
--- a/sys/netinet/tcp_syncache.c
+++ b/sys/netinet/tcp_syncache.c
@@ -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,
diff --git a/sys/netinet/tcp_timewait.c b/sys/netinet/tcp_timewait.c
index 1ac14ec..a6ac5c6 100644
--- a/sys/netinet/tcp_timewait.c
+++ b/sys/netinet/tcp_timewait.c
@@ -104,8 +104,8 @@ static VNET_DEFINE(uma_zone_t, tcptw_zone);
 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 *);
diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h
index 8c175f8..8845769 100644
--- a/sys/netinet/tcp_var.h
+++ b/sys/netinet/tcp_var.h
@@ -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)
+#define	V_nolocaltimewait	VNET(nolocaltimewait)
 
 VNET_DECLARE(int, tcp_do_sack);			/* SACK enabled/disabled */
 VNET_DECLARE(int, tcp_sack_maxholes);
@@ -606,13 +606,13 @@ VNET_DECLARE(int, tcp_sc_rst_sock_fail);	/* RST on sock alloc failure */
 VNET_DECLARE(int, tcp_do_ecn);			/* TCP ECN enabled/disabled */
 VNET_DECLARE(int, tcp_ecn_maxretries);
 
-#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_tcp_sc_rst_sock_fail	VNET_GET(tcp_sc_rst_sock_fail)
-#define	V_tcp_do_ecn		VNET_GET(tcp_do_ecn)
-#define	V_tcp_ecn_maxretries	VNET_GET(tcp_ecn_maxretries)
+#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)
+#define	V_tcp_sc_rst_sock_fail	VNET(tcp_sc_rst_sock_fail)
+#define	V_tcp_do_ecn		VNET(tcp_do_ecn)
+#define	V_tcp_ecn_maxretries	VNET(tcp_ecn_maxretries)
 
 int	 tcp_addoptions(struct tcpopt *, u_char *);
 struct tcpcb *
diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c
index f9623f3..54fb996 100644
--- a/sys/netinet/udp_usrreq.c
+++ b/sys/netinet/udp_usrreq.c
@@ -136,7 +136,7 @@ VNET_DEFINE(struct inpcbinfo, udbinfo);
 static VNET_DEFINE(uma_zone_t, udpcb_zone);
 VNET_DEFINE(struct udpstat, udpstat);		/* from udp_var.h */
 
-#define	V_udpcb_zone			VNET_GET(udpcb_zone)
+#define	V_udpcb_zone			VNET(udpcb_zone)
 
 #ifndef UDBHASHSIZE
 #define	UDBHASHSIZE	128
diff --git a/sys/netinet/udp_var.h b/sys/netinet/udp_var.h
index 417c597..8031670 100644
--- a/sys/netinet/udp_var.h
+++ b/sys/netinet/udp_var.h
@@ -124,10 +124,10 @@ VNET_DECLARE(struct inpcbinfo, udbinfo);
 VNET_DECLARE(struct udpstat, udpstat);
 VNET_DECLARE(int, udp_blackhole);
 
-#define	V_udb			VNET_GET(udb)
-#define	V_udbinfo		VNET_GET(udbinfo)
-#define	V_udpstat		VNET_GET(udpstat)
-#define	V_udp_blackhole		VNET_GET(udp_blackhole)
+#define	V_udb			VNET(udb)
+#define	V_udbinfo		VNET(udbinfo)
+#define	V_udpstat		VNET(udpstat)
+#define	V_udp_blackhole		VNET(udp_blackhole)
 
 extern u_long			udp_sendspace;
 extern u_long			udp_recvspace;