summaryrefslogtreecommitdiff
path: root/sys/netinet/in_proto.c
diff options
context:
space:
mode:
authorMartin Pieuchot <mpi@cvs.openbsd.org>2015-07-18 15:51:18 +0000
committerMartin Pieuchot <mpi@cvs.openbsd.org>2015-07-18 15:51:18 +0000
commit2271698f85393fb0d080c95f2232ce5bca8baf31 (patch)
tree8b799caea4e40a4941422811d640a5cf14608159 /sys/netinet/in_proto.c
parentcfe2dd9907ff6b16160feb76eff7dc874abe1c8e (diff)
Abstract the routing table internals behind an rtable_* API.
Code abusing the radix internals for the routing table should now includes <net/rtable.h> and only deal with "struct rtentry". Code using a radix tree for another purpose can still include <net/radix.h>. Inputs from and ok claudio@, mikeb@
Diffstat (limited to 'sys/netinet/in_proto.c')
-rw-r--r--sys/netinet/in_proto.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/sys/netinet/in_proto.c b/sys/netinet/in_proto.c
index d11a3f84a29..1e074a11ab6 100644
--- a/sys/netinet/in_proto.c
+++ b/sys/netinet/in_proto.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: in_proto.c,v 1.63 2014/12/05 15:50:04 mpi Exp $ */
+/* $OpenBSD: in_proto.c,v 1.64 2015/07/18 15:51:17 mpi Exp $ */
/* $NetBSD: in_proto.c,v 1.14 1996/02/18 18:58:32 christos Exp $ */
/*
@@ -106,10 +106,7 @@
#include <net/if.h>
#include <net/if_var.h>
#include <net/route.h>
-#include <net/radix.h>
-#ifndef SMALL_KERNEL
-#include <net/radix_mpath.h>
-#endif
+#include <net/rtable.h>
#include <netinet/in.h>
#include <netinet/ip.h>
@@ -313,9 +310,5 @@ struct protosw inetsw[] = {
struct domain inetdomain =
{ AF_INET, "internet", 0, 0, 0,
inetsw, &inetsw[nitems(inetsw)], 0,
-#ifndef SMALL_KERNEL
- rn_mpath_inithead,
-#else
- rn_inithead,
-#endif
+ rtable_attach,
32, sizeof(struct sockaddr_in) };