diff options
| author | bz <bz@FreeBSD.org> | 2016-06-01 10:14:04 +0000 |
|---|---|---|
| committer | bz <bz@FreeBSD.org> | 2016-06-01 10:14:04 +0000 |
| commit | fac944a70a00eab9c2ba2b2e96df710bcfc78593 (patch) | |
| tree | af4395ee554e65ffb7f0260620e5a4fe86961130 /sys/netinet/ip_var.h | |
| parent | e6448344d4a588a7e0ec3874480c44ea1fe24be5 (diff) | |
| download | FreeBSD-src-fac944a70a00eab9c2ba2b2e96df710bcfc78593.zip FreeBSD-src-fac944a70a00eab9c2ba2b2e96df710bcfc78593.tar.gz | |
The pr_destroy field does not allow us to run the teardown code in a
specific order. VNET_SYSUNINITs however are doing exactly that.
Thus remove the VIMAGE conditional field from the domain(9) protosw
structure and replace it with VNET_SYSUNINITs.
This also allows us to change some order and to make the teardown functions
file local static.
Also convert divert(4) as it uses the same mechanism ip(4) and ip6(4) use
internally.
Slightly reshuffle the SI_SUB_* fields in kernel.h and add a new ones, e.g.,
for pfil consumers (firewalls), partially for this commit and for others
to come.
Reviewed by: gnn, tuexen (sctp), jhb (kernel.h)
Obtained from: projects/vnet
MFC after: 2 weeks
X-MFC: do not remove pr_destroy
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D6652
Diffstat (limited to 'sys/netinet/ip_var.h')
| -rw-r--r-- | sys/netinet/ip_var.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h index f4ad4ff..847704f 100644 --- a/sys/netinet/ip_var.h +++ b/sys/netinet/ip_var.h @@ -209,9 +209,6 @@ int ip_fragment(struct ip *ip, struct mbuf **m_frag, int mtu, u_long if_hwassist_flags); void ip_forward(struct mbuf *m, int srcrt); void ip_init(void); -#ifdef VIMAGE -void ip_destroy(void); -#endif extern int (*ip_mforward)(struct ip *, struct ifnet *, struct mbuf *, struct ip_moptions *); @@ -229,9 +226,6 @@ void ip_fillid(struct ip *); int rip_ctloutput(struct socket *, struct sockopt *); void rip_ctlinput(int, struct sockaddr *, void *); void rip_init(void); -#ifdef VIMAGE -void rip_destroy(void); -#endif int rip_input(struct mbuf **, int *, int); int rip_output(struct mbuf *, struct socket *, ...); int ipip_input(struct mbuf **, int *, int); |
