33c33
< __FBSDID("$FreeBSD: head/sys/netinet/ip_input.c 206989 2010-04-21 10:21:34Z bz $");
---
> __FBSDID("$FreeBSD: head/sys/netinet/ip_input.c 207369 2010-04-29 11:52:42Z bz $");
92,128d91
< static VNET_DEFINE(int, ipsendredirects) = 1; /* XXX */
< static VNET_DEFINE(int, ip_checkinterface);
< static VNET_DEFINE(int, ip_keepfaith);
< static VNET_DEFINE(int, 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);
< VNET_DEFINE(int, ipforwarding);
<
< VNET_DEFINE(struct in_ifaddrhead, in_ifaddrhead); /* first inet address */
< VNET_DEFINE(struct in_ifaddrhashhead *, in_ifaddrhashtbl); /* inet addr hash table */
< VNET_DEFINE(u_long, in_ifaddrhmask); /* mask for hash table */
< VNET_DEFINE(struct ipstat, ipstat);
<
< static VNET_DEFINE(int, ip_rsvp_on);
< VNET_DEFINE(struct socket *, ip_rsvpd);
< VNET_DEFINE(int, 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(ipq)
< #define V_maxnipq VNET(maxnipq)
< #define V_maxfragsperpacket VNET(maxfragsperpacket)
< #define V_nipq VNET(nipq)
<
< VNET_DEFINE(int, ipstealth);
<
131a95,97
> VNET_DEFINE(int, rsvp_on);
>
> VNET_DEFINE(int, ipforwarding);
135a102,103
> static VNET_DEFINE(int, ipsendredirects) = 1; /* XXX */
> #define V_ipsendredirects VNET(ipsendredirects)
139a108
> VNET_DEFINE(int, ip_defttl) = IPDEFTTL;
143a113,114
> static VNET_DEFINE(int, ip_keepfaith);
> #define V_ip_keepfaith VNET(ip_keepfaith)
147a119,120
> static VNET_DEFINE(int, ip_sendsourcequench);
> #define V_ip_sendsourcequench VNET(ip_sendsourcequench)
151a125
> VNET_DEFINE(int, ip_do_randomid);
168a143,144
> static VNET_DEFINE(int, ip_checkinterface);
> #define V_ip_checkinterface VNET(ip_checkinterface)
184a161,163
> VNET_DEFINE(struct in_ifaddrhead, in_ifaddrhead); /* first inet address */
> VNET_DEFINE(struct in_ifaddrhashhead *, in_ifaddrhashtbl); /* inet addr hash table */
> VNET_DEFINE(u_long, in_ifaddrhmask); /* mask for hash table */
185a165
> VNET_DEFINE(struct ipstat, ipstat);
191,192c171
< #define V_ipq_zone VNET(ipq_zone)
<
---
> static VNET_DEFINE(TAILQ_HEAD(ipqhead, ipq), ipq[IPREASS_NHASH]);
194a174,176
> #define V_ipq_zone VNET(ipq_zone)
> #define V_ipq VNET(ipq)
>
203a186,189
> static VNET_DEFINE(int, maxnipq); /* Administrative limit on # reass queues. */
> static VNET_DEFINE(int, nipq); /* Total # of reass queues */
> #define V_maxnipq VNET(maxnipq)
> #define V_nipq VNET(nipq)
207a194,195
> static VNET_DEFINE(int, maxfragsperpacket);
> #define V_maxfragsperpacket VNET(maxfragsperpacket)
219a208
> VNET_DEFINE(int, ipstealth);
1742a1732,1736
> static VNET_DEFINE(int, ip_rsvp_on);
> VNET_DEFINE(struct socket *, ip_rsvpd);
>
> #define V_ip_rsvp_on VNET(ip_rsvp_on)
>