Apply the STATIC_VNET_DEFINE and STATIC_DPCPU_DEFINE macros throughout

the tree.

9 files changed, 23 insertions, 23 deletions

diff --git a/sys/net/flowtable.c b/sys/net/flowtable.c
index 4988670..8728cf3 100644
--- a/sys/net/flowtable.c
+++ b/sys/net/flowtable.c
@@ -184,10 +184,10 @@ struct flowtable {
 } __aligned(CACHE_LINE_SIZE);
 
 static 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);
 
 #define	V_flow_list_head	VNET(flow_list_head)
 #define	V_flow_hashjitter	VNET(flow_hashjitter)
@@ -230,13 +230,13 @@ do {		  				\
  * - idetach() cleanup for options VIMAGE builds.
  */
 VNET_DEFINE(int, flowtable_enable) = 1;
-static VNET_DEFINE(int, flowtable_debug);
-static VNET_DEFINE(int, flowtable_syn_expire) = SYN_IDLE;
-static VNET_DEFINE(int, flowtable_udp_expire) = UDP_IDLE;
-static VNET_DEFINE(int, flowtable_fin_wait_expire) = FIN_WAIT_IDLE;
-static VNET_DEFINE(int, flowtable_tcp_expire) = TCP_IDLE;
-static VNET_DEFINE(int, flowtable_nmbflows);
-static VNET_DEFINE(int, flowtable_ready) = 0;
+STATIC_VNET_DEFINE(int, flowtable_debug);
+STATIC_VNET_DEFINE(int, flowtable_syn_expire) = SYN_IDLE;
+STATIC_VNET_DEFINE(int, flowtable_udp_expire) = UDP_IDLE;
+STATIC_VNET_DEFINE(int, flowtable_fin_wait_expire) = FIN_WAIT_IDLE;
+STATIC_VNET_DEFINE(int, flowtable_tcp_expire) = TCP_IDLE;
+STATIC_VNET_DEFINE(int, flowtable_nmbflows);
+STATIC_VNET_DEFINE(int, flowtable_ready) = 0;
 
 #define	V_flowtable_enable		VNET(flowtable_enable)
 #define	V_flowtable_debug		VNET(flowtable_debug)
diff --git a/sys/net/if.c b/sys/net/if.c
index 17f01e9..5720294 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -183,7 +183,7 @@ int	ifqmaxlen = IFQ_MAXLEN;
 VNET_DEFINE(struct ifnethead, ifnet);	/* depend on static init XXX */
 VNET_DEFINE(struct ifgrouphead, ifg_head);
 
-static VNET_DEFINE(int, if_indexlim) = 8;
+STATIC_VNET_DEFINE(int, if_indexlim) = 8;
 
 /* Table of ifnet by index. */
 VNET_DEFINE(struct ifindex_entry *, ifindex_table);
diff --git a/sys/net/if_clone.c b/sys/net/if_clone.c
index c02737b..d07f517 100644
--- a/sys/net/if_clone.c
+++ b/sys/net/if_clone.c
@@ -56,7 +56,7 @@ static int	if_clone_createif(struct if_clone *ifc, char *name, size_t len,
 		    caddr_t params);
 
 static struct mtx	if_cloners_mtx;
-static VNET_DEFINE(int, if_cloners_count);
+STATIC_VNET_DEFINE(int, if_cloners_count);
 VNET_DEFINE(LIST_HEAD(, if_clone), if_cloners);
 
 #define	V_if_cloners_count	VNET(if_cloners_count)
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
index 5e5a548..0c48ff1 100644
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -144,7 +144,7 @@ MALLOC_DEFINE(M_ARPCOM, "arpcom", "802.* interface internals");
 #if defined(INET) || defined(INET6)
 int
 ether_ipfw_chk(struct mbuf **m0, struct ifnet *dst, int shared);
-static VNET_DEFINE(int, ether_ipfw);
+STATIC_VNET_DEFINE(int, ether_ipfw);
 #define	V_ether_ipfw	VNET(ether_ipfw)
 #endif
 
diff --git a/sys/net/if_gif.c b/sys/net/if_gif.c
index 7683839..be71d60 100644
--- a/sys/net/if_gif.c
+++ b/sys/net/if_gif.c
@@ -94,7 +94,7 @@
  */
 static struct mtx gif_mtx;
 static 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);
 #define	V_gif_softc_list	VNET(gif_softc_list)
 
 void	(*ng_gif_input_p)(struct ifnet *ifp, struct mbuf **mp, int af);
@@ -124,7 +124,7 @@ SYSCTL_NODE(_net_link, IFT_GIF, gif, CTLFLAG_RW, 0,
  */
 #define MAX_GIF_NEST 1
 #endif
-static VNET_DEFINE(int, max_gif_nesting) = MAX_GIF_NEST;
+STATIC_VNET_DEFINE(int, max_gif_nesting) = MAX_GIF_NEST;
 #define	V_max_gif_nesting	VNET(max_gif_nesting)
 SYSCTL_VNET_INT(_net_link_gif, OID_AUTO, max_nesting, CTLFLAG_RW,
     &VNET_NAME(max_gif_nesting), 0, "Max nested tunnels");
@@ -135,9 +135,9 @@ SYSCTL_VNET_INT(_net_link_gif, OID_AUTO, max_nesting, CTLFLAG_RW,
  * we allow control over this check here.
  */
 #ifdef XBONEHACK
-static VNET_DEFINE(int, parallel_tunnels) = 1;
+STATIC_VNET_DEFINE(int, parallel_tunnels) = 1;
 #else
-static VNET_DEFINE(int, parallel_tunnels) = 0;
+STATIC_VNET_DEFINE(int, parallel_tunnels) = 0;
 #endif
 #define	V_parallel_tunnels	VNET(parallel_tunnels)
 SYSCTL_VNET_INT(_net_link_gif, OID_AUTO, parallel_tunnels, CTLFLAG_RW,
diff --git a/sys/net/if_llatbl.c b/sys/net/if_llatbl.c
index 910d366..7ccd81f 100644
--- a/sys/net/if_llatbl.c
+++ b/sys/net/if_llatbl.c
@@ -62,7 +62,7 @@ __FBSDID("$FreeBSD$");
 
 MALLOC_DEFINE(M_LLTABLE, "lltable", "link level address tables");
 
-static VNET_DEFINE(SLIST_HEAD(, lltable), lltables);
+STATIC_VNET_DEFINE(SLIST_HEAD(, lltable), lltables);
 #define	V_lltables	VNET(lltables)
 
 extern void arprequest(struct ifnet *, struct in_addr *, struct in_addr *,
diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c
index 78d2de2..94d51c0 100644
--- a/sys/net/if_loop.c
+++ b/sys/net/if_loop.c
@@ -106,8 +106,8 @@ static void	lo_clone_destroy(struct ifnet *);
 VNET_DEFINE(struct ifnet *, loif);	/* Used externally */
 
 #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);
 #define	V_lo_cloner_data	VNET(lo_cloner_data)
 #define	V_lo_cloner		VNET(lo_cloner)
 #endif
diff --git a/sys/net/route.c b/sys/net/route.c
index 5cb06e6..ae4b2ca 100644
--- a/sys/net/route.c
+++ b/sys/net/route.c
@@ -113,7 +113,7 @@ VNET_DEFINE(int, rttrash);		/* routes not in table but not freed */
  */
 #define RNTORT(p)	((struct rtentry *)(p))
 
-static VNET_DEFINE(uma_zone_t, rtzone);		/* Routing table UMA zone. */
+STATIC_VNET_DEFINE(uma_zone_t, rtzone);		/* Routing table UMA zone. */
 #define	V_rtzone	VNET(rtzone)
 
 #if 0
diff --git a/sys/net/vnet.c b/sys/net/vnet.c
index 8fc52b2..3608fce 100644
--- a/sys/net/vnet.c
+++ b/sys/net/vnet.c
@@ -177,7 +177,7 @@ MALLOC_DEFINE(M_VNET_DATA, "vnet_data", "VNET data");
  * Space to store virtualized global variables from loadable kernel modules,
  * and the free list to manage it.
  */
-static VNET_DEFINE(char, modspace[VNET_MODMIN]);
+STATIC_VNET_DEFINE(char, modspace[VNET_MODMIN]);
 
 /*
  * Global lists of subsystem constructor and destructors for vnets.  They are