summaryrefslogtreecommitdiff
path: root/sys/netmpls
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/netmpls
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/netmpls')
-rw-r--r--sys/netmpls/mpls_proto.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/netmpls/mpls_proto.c b/sys/netmpls/mpls_proto.c
index 0354abce9d6..d81f98a337c 100644
--- a/sys/netmpls/mpls_proto.c
+++ b/sys/netmpls/mpls_proto.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mpls_proto.c,v 1.9 2014/12/05 15:50:04 mpi Exp $ */
+/* $OpenBSD: mpls_proto.c,v 1.10 2015/07/18 15:51:17 mpi Exp $ */
/*
* Copyright (C) 1999, 2000 and 2001 AYAME Project, WIDE Project.
@@ -38,8 +38,7 @@
#include <net/if.h>
#include <net/if_var.h>
-#include <net/radix.h>
-#include <net/radix_mpath.h>
+#include <net/rtable.h>
#include <netmpls/mpls.h>
@@ -69,7 +68,7 @@ struct domain mplsdomain = {
AF_MPLS, "mpls", mpls_init, 0, 0,
mplssw,
&mplssw[nitems(mplssw)], 0,
- rn_mpath_inithead,
+ rtable_attach,
offsetof(struct sockaddr_mpls, smpls_label) << 3,
sizeof(struct sockaddr_mpls)
};