27c27
< __FBSDID("$FreeBSD: head/sys/netinet/ipfw/ip_fw_dynamic.c 215317 2010-11-14 20:38:11Z dim $");
---
> __FBSDID("$FreeBSD: head/sys/netinet/ipfw/ip_fw_dynamic.c 215701 2010-11-22 19:32:54Z dim $");
121,124c121,124
< 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);
153,158c153,158
< 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);
175,177c175,177
< 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);
183,184c183,184
< STATIC_VNET_DEFINE(u_int32_t, dyn_count); /* # of dynamic rules */
< STATIC_VNET_DEFINE(u_int32_t, dyn_max); /* max # of dynamic rules */
---
> static VNET_DEFINE(u_int32_t, dyn_count); /* # of dynamic rules */
> static VNET_DEFINE(u_int32_t, dyn_max); /* max # of dynamic rules */