diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2014-11-01 21:40:40 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2014-11-01 21:40:40 +0000 |
| commit | 5253d59489b771872b9901a35e753887ebbd5095 (patch) | |
| tree | 9fc9f066533041fb6d0daed126f4734e6a52008b /sys/netmpls | |
| parent | a5f79d90ac87d61dd3b65edfd8892b4192d33de5 (diff) | |
Rename rtalloc1() into rtalloc(9) and convert its flags to only enable
functionnality instead of a mix of enable/disable.
ok bluhm@, jca@
Diffstat (limited to 'sys/netmpls')
| -rw-r--r-- | sys/netmpls/mpls_input.c | 6 | ||||
| -rw-r--r-- | sys/netmpls/mpls_output.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/netmpls/mpls_input.c b/sys/netmpls/mpls_input.c index 4a5aba55f3c..0bdce93a28c 100644 --- a/sys/netmpls/mpls_input.c +++ b/sys/netmpls/mpls_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpls_input.c,v 1.39 2014/10/14 09:52:26 mpi Exp $ */ +/* $OpenBSD: mpls_input.c,v 1.40 2014/11/01 21:40:39 mpi Exp $ */ /* * Copyright (c) 2008 Claudio Jeker <claudio@openbsd.org> @@ -205,7 +205,7 @@ do_v6: } } - rt = rtalloc1(smplstosa(smpls), RT_REPORT, 0); + rt = rtalloc(smplstosa(smpls), RT_REPORT|RT_RESOLVE, 0); if (rt == NULL) { /* no entry for this label */ #ifdef MPLS_DEBUG @@ -455,7 +455,7 @@ mpls_do_error(struct mbuf *m, int type, int code, int destmtu) smpls->smpls_len = sizeof(*smpls); smpls->smpls_label = shim->shim_label & MPLS_LABEL_MASK; - rt = rtalloc1(smplstosa(smpls), RT_REPORT, 0); + rt = rtalloc(smplstosa(smpls), RT_REPORT|RT_RESOLVE, 0); if (rt == NULL) { /* no entry for this label */ m_freem(m); diff --git a/sys/netmpls/mpls_output.c b/sys/netmpls/mpls_output.c index ec8504969de..e25ee92f356 100644 --- a/sys/netmpls/mpls_output.c +++ b/sys/netmpls/mpls_output.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpls_output.c,v 1.17 2014/07/22 11:06:10 mpi Exp $ */ +/* $OpenBSD: mpls_output.c,v 1.18 2014/11/01 21:40:39 mpi Exp $ */ /* * Copyright (c) 2008 Claudio Jeker <claudio@openbsd.org> @@ -121,7 +121,7 @@ mpls_output(struct ifnet *ifp0, struct mbuf *m, struct sockaddr *dst, break; smpls->smpls_label = shim->shim_label & MPLS_LABEL_MASK; - rt = rtalloc1(smplstosa(smpls), RT_REPORT, 0); + rt = rtalloc(smplstosa(smpls), RT_REPORT|RT_RESOLVE, 0); if (rt == NULL) { /* no entry for this label */ #ifdef MPLS_DEBUG |