summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authormpi <mpi@openbsd.org>2015-07-18 15:47:01 +0000
committermpi <mpi@openbsd.org>2015-07-18 15:47:01 +0000
commitdbd66a7b1910ba65112b50c66ad0e46f5009224a (patch)
tree8f5e7f50d404c467320c8bd1253df2bce6edc752 /sys
parentkill trailing whitespace (diff)
downloadwireguard-openbsd-dbd66a7b1910ba65112b50c66ad0e46f5009224a.tar.xz
wireguard-openbsd-dbd66a7b1910ba65112b50c66ad0e46f5009224a.zip
Even if pf(4) is not compiled with SMALL_KERNEL add a define around
rt_mpath_next() to document the difference in behavior between the multipath and non-multipath routing code. No that the same pattern is present in if_group_egress_build(). ok claudio@
Diffstat (limited to 'sys')
-rw-r--r--sys/net/pf.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/sys/net/pf.c b/sys/net/pf.c
index ad704b7bdc1..fc29f01da14 100644
--- a/sys/net/pf.c
+++ b/sys/net/pf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pf.c,v 1.926 2015/07/18 15:19:44 sashan Exp $ */
+/* $OpenBSD: pf.c,v 1.927 2015/07/18 15:47:01 mpi Exp $ */
/*
* Copyright (c) 2001 Daniel Hartmeier
@@ -59,7 +59,6 @@
#include <net/if_var.h>
#include <net/if_types.h>
#include <net/route.h>
-#include <net/radix_mpath.h>
#include <netinet/in.h>
#include <netinet/ip.h>
@@ -5358,7 +5357,11 @@ pf_routable(struct pf_addr *addr, sa_family_t af, struct pfi_kif *kif,
if (kif->pfik_ifp == ifp)
ret = 1;
+#ifndef SMALL_KERNEL
rt = rt_mpath_next(rt);
+#else
+ rt = NULL;
+#endif
} while (check_mpath == 1 && rt != NULL && ret == 0);
} else
ret = 0;