summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMartin Pieuchot <mpi@cvs.openbsd.org>2015-11-06 18:07:58 +0000
committerMartin Pieuchot <mpi@cvs.openbsd.org>2015-11-06 18:07:58 +0000
commit4340a75d414875cbcb12dc4b7b6da958b8c6ce2c (patch)
tree628629c40c4b48c2345c5ab9bf14a59c295dbe10 /sys
parent093fc771b1b5bfc34eb0828a0db6ed72c83ca68d (diff)
Do not compile net/radix_mpath.c in ART-enabled kernels.
In such kernels multipath routing support is independant from the data structure used to perform the binary lookup. Is is implemented as a singly-listed list of route entries. This is possible because a "struct rtentry" is no longer mapped 1:1 to a node in the tree.
Diffstat (limited to 'sys')
-rw-r--r--sys/conf/files4
-rw-r--r--sys/net/radix.c6
2 files changed, 7 insertions, 3 deletions
diff --git a/sys/conf/files b/sys/conf/files
index 173c4d0efd2..d77b2731fd0 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1,4 +1,4 @@
-# $OpenBSD: files,v 1.606 2015/11/03 01:31:36 mikeb Exp $
+# $OpenBSD: files,v 1.607 2015/11/06 18:07:57 mpi Exp $
# $NetBSD: files,v 1.87 1996/05/19 17:17:50 jonathan Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
@@ -773,7 +773,7 @@ file net/bridgestp.c bridge
file net/if_vlan.c vlan needs-count
file net/pipex.c pipex
file net/radix.c
-file net/radix_mpath.c !small_kernel
+file net/radix_mpath.c !small_kernel & !art
file net/raw_cb.c
file net/raw_usrreq.c
file net/rtable.c
diff --git a/sys/net/radix.c b/sys/net/radix.c
index 6b543dc3985..71d7c6d7f9e 100644
--- a/sys/net/radix.c
+++ b/sys/net/radix.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: radix.c,v 1.51 2015/11/04 09:50:21 mpi Exp $ */
+/* $OpenBSD: radix.c,v 1.52 2015/11/06 18:07:57 mpi Exp $ */
/* $NetBSD: radix.c,v 1.20 2003/08/07 16:32:56 agc Exp $ */
/*
@@ -48,6 +48,10 @@
#include <net/radix.h>
+#if defined(ART) && !defined(SMALL_KERNEL)
+#define SMALL_KERNEL
+#endif
+
#ifndef SMALL_KERNEL
#include <sys/socket.h>
#include <net/route.h>