Index: if.c
===================================================================
RCS file: /usr/store/mlaier/fcvs/src/sys/net/if.c,v
retrieving revision 1.198
diff -u -r1.198 if.c
--- if.c	6 Aug 2004 09:08:33 -0000	1.198
+++ if.c	22 Aug 2004 17:14:24 -0000
@@ -480,9 +480,16 @@
 	s = splnet();
 
 	/*
-	 * Since dp->dom_ifattach calls malloc() with M_WAITOK, we
+	 * XXX: Since dp->dom_ifattach calls malloc() with M_WAITOK, we
 	 * cannot lock ifp->if_afdata initialization, entirely.
+	 *
+	 * If there are no domains do not set if_afdata_initialized to allow
+	 * initialization later (via SI_SUB_PROTO_IFATTACHDOMAIN).
 	 */
+	if (domains == NULL) {
+		splx(s);
+		return;
+	}
 	if (IF_AFDATA_TRYLOCK(ifp) == 0) {
 		splx(s);
 		return;