diff options
| author | bz <bz@FreeBSD.org> | 2008-12-11 16:26:38 +0000 |
|---|---|---|
| committer | bz <bz@FreeBSD.org> | 2008-12-11 16:26:38 +0000 |
| commit | 83a32f8750135cc82be5727b54cb42797923009b (patch) | |
| tree | 969ea1192ccca86b51199d256a5beea929f92162 /sys/netinet/ip_var.h | |
| parent | 83955c51afc9c7fd1b9b5164cbbbf65f1706262b (diff) | |
| download | FreeBSD-src-83a32f8750135cc82be5727b54cb42797923009b.zip FreeBSD-src-83a32f8750135cc82be5727b54cb42797923009b.tar.gz | |
Put a global variables, which were virtualized but formerly
missed under VIMAGE_GLOBAL.
Start putting the extern declarations of the virtualized globals
under VIMAGE_GLOBAL as the globals themsevles are already.
This will help by the time when we are going to remove the globals
entirely.
While there garbage collect a few dead externs from ip6_var.h.
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'sys/netinet/ip_var.h')
| -rw-r--r-- | sys/netinet/ip_var.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h index a4e73db..f023051 100644 --- a/sys/netinet/ip_var.h +++ b/sys/netinet/ip_var.h @@ -175,6 +175,7 @@ struct inpcb; struct route; struct sockopt; +#ifdef VIMAGE_GLOBALS extern struct ipstat ipstat; extern u_short ip_id; /* ip packet ctr, for ids */ extern int ip_do_randomid; @@ -183,12 +184,13 @@ extern int ipforwarding; /* ip forwarding */ #ifdef IPSTEALTH extern int ipstealth; /* stealth forwarding */ #endif -extern u_char ip_protox[]; +extern int rsvp_on; extern struct socket *ip_rsvpd; /* reservation protocol daemon */ extern struct socket *ip_mrouter; /* multicast routing daemon */ +#endif +extern u_char ip_protox[]; extern int (*legal_vif_num)(int); extern u_long (*ip_mcast_src)(int); -extern int rsvp_on; extern struct pr_usrreqs rip_usrreqs; void inp_freemoptions(struct ip_moptions *); |
