From cb64988f42a7f45745e38f15e1a13a9097fdce27 Mon Sep 17 00:00:00 2001
From: Luoqi Chen <luoqi@FreeBSD.org>
Date: Thu, 29 Apr 1999 03:22:19 +0000
Subject: [PATCH] Postpone route_init() until all domains are attached.

---
 sys/net/radix.c  | 3 +--
 sys/net/route.c  | 5 ++++-
 sys/net/rtsock.c | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/sys/net/radix.c b/sys/net/radix.c
index 25b2e1a2ba6a..bca5bddb9d74 100644
--- a/sys/net/radix.c
+++ b/sys/net/radix.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)radix.c	8.4 (Berkeley) 11/2/94
- *	$Id: radix.c,v 1.15 1998/07/11 10:51:01 bde Exp $
+ *	$Id: radix.c,v 1.16 1999/04/26 09:05:31 peter Exp $
  */
 
 /*
@@ -1003,7 +1003,6 @@ rn_init()
 #ifdef KERNEL
 	struct domain *dom;
 
-	max_keylen = 16;	/* XXX sizeof sockaddr_in - temp hack!! */
 	for (dom = domains; dom; dom = dom->dom_next)
 		if (dom->dom_maxrtkey > max_keylen)
 			max_keylen = dom->dom_maxrtkey;
diff --git a/sys/net/route.c b/sys/net/route.c
index 6a17db6a1928..b0af484581d3 100644
--- a/sys/net/route.c
+++ b/sys/net/route.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)route.c	8.2 (Berkeley) 11/15/93
- *	$Id: route.c,v 1.50 1998/04/17 22:36:57 des Exp $
+ *	$Id: route.c,v 1.51 1999/01/27 22:42:14 dillon Exp $
  */
 
 #include "opt_inet.h"
@@ -43,6 +43,7 @@
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/domain.h>
+#include <sys/kernel.h>
 
 #include <net/if.h>
 #include <net/route.h>
@@ -1062,3 +1063,5 @@ rtinit(ifa, cmd, flags)
 	}
 	return (error);
 }
+
+SYSINIT(route, SI_SUB_PROTO_DOMAIN, SI_ORDER_ANY, route_init, 0);
diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c
index a57b518b2785..22c7bb5c6cd1 100644
--- a/sys/net/rtsock.c
+++ b/sys/net/rtsock.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)rtsock.c	8.5 (Berkeley) 11/2/94
- *	$Id: rtsock.c,v 1.38 1999/01/27 22:42:14 dillon Exp $
+ *	$Id: rtsock.c,v 1.39 1999/04/28 11:37:38 phk Exp $
  */
 
 
@@ -996,7 +996,7 @@ static struct protosw routesw[] = {
 };
 
 static struct domain routedomain =
-    { PF_ROUTE, "route", route_init, 0, 0,
+    { PF_ROUTE, "route", 0, 0, 0,
       routesw, &routesw[sizeof(routesw)/sizeof(routesw[0])] };
 
 DOMAIN_SET(route);