diff options
| author | mlaier <mlaier@FreeBSD.org> | 2004-11-30 22:38:37 +0000 |
|---|---|---|
| committer | mlaier <mlaier@FreeBSD.org> | 2004-11-30 22:38:37 +0000 |
| commit | 834b0b8b466605e20c3c67f5b400237aa8e5714e (patch) | |
| tree | 0a14d6cd704859dd4b7f1c5a7b87c6923141cf9a /sys/net | |
| parent | ea0fd1c0832b6eab6bd5fefdb7bdf0ecc2a8cbfc (diff) | |
| download | FreeBSD-src-834b0b8b466605e20c3c67f5b400237aa8e5714e.zip FreeBSD-src-834b0b8b466605e20c3c67f5b400237aa8e5714e.tar.gz | |
Implement the check I was talking about in the previous message already.
Introduce domain_init_status to keep track of the init status of the domains
list (surprise). 0 = uninitialized, 1 = initialized/unpopulated, 2 =
initialized/done. Higher values can be used to support late addition of
domains which right now "works", but is potential dangerous. I choose to
only give a warning when doing so.
Use domain_init_status with if_attachdomain[1]() to ensure that we have a
complete domains list when we init the if_afdata array. Store the current
value of domain_init_status in if_afdata_initialized. This way we can update
if_afdata after a new protocol has been added (once that is allowed).
Submitted by: se (with changes)
Reviewed by: julian, glebius, se
PR: kern/73321 (partly)
Diffstat (limited to 'sys/net')
| -rw-r--r-- | sys/net/if.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/net/if.c b/sys/net/if.c index f6728df..b21701d 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -451,7 +451,7 @@ if_attach(struct ifnet *ifp) ifp->if_snd.altq_tbr = NULL; ifp->if_snd.altq_ifp = ifp; - if (domains) + if (domain_init_status >= 2) if_attachdomain1(ifp); EVENTHANDLER_INVOKE(ifnet_arrival_event, ifp); @@ -471,7 +471,7 @@ if_attachdomain(void *dummy) if_attachdomain1(ifp); splx(s); } -SYSINIT(domainifattach, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_FIRST, +SYSINIT(domainifattach, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_SECOND, if_attachdomain, NULL); static void @@ -490,14 +490,14 @@ if_attachdomain1(struct ifnet *ifp) splx(s); return; } - if (ifp->if_afdata_initialized) { + if (ifp->if_afdata_initialized >= domain_init_status) { IF_AFDATA_UNLOCK(ifp); splx(s); printf("if_attachdomain called more than once on %s\n", ifp->if_xname); return; } - ifp->if_afdata_initialized = 1; + ifp->if_afdata_initialized = domain_init_status; IF_AFDATA_UNLOCK(ifp); /* address family dependent data region */ |
