summaryrefslogtreecommitdiff
path: root/sys/net/route.c
diff options
context:
space:
mode:
authorMichele Marchetto <michele@cvs.openbsd.org>2009-02-03 16:42:55 +0000
committerMichele Marchetto <michele@cvs.openbsd.org>2009-02-03 16:42:55 +0000
commit628b50697a8761bcac8e34d9ffdff103646d2ee5 (patch)
treec54d8e7ccca81946fdf4770fd31ea7a5e3e6bfac /sys/net/route.c
parent444bd5f6a3e4b86e7149f6cf0a472cd13248ac01 (diff)
Use our own flags to set the operations and not RTF_PROTOX.
Switch the padding field into a MPLS one in rt_msghdr to store relevant informations. OK claudio@ laurent@
Diffstat (limited to 'sys/net/route.c')
-rw-r--r--sys/net/route.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/net/route.c b/sys/net/route.c
index 3e5ec851890..cc8931836c1 100644
--- a/sys/net/route.c
+++ b/sys/net/route.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: route.c,v 1.102 2009/01/28 22:18:44 michele Exp $ */
+/* $OpenBSD: route.c,v 1.103 2009/02/03 16:42:54 michele Exp $ */
/* $NetBSD: route.c,v 1.14 1996/02/13 22:00:46 christos Exp $ */
/*
@@ -897,8 +897,7 @@ makeroute:
if (sa_mpls != NULL)
rt_mpls->mpls_label = sa_mpls->smpls_label;
- rt_mpls->mpls_operation = rt->rt_flags &
- (MPLS_OP_PUSH | MPLS_OP_POP | MPLS_OP_SWAP);
+ rt_mpls->mpls_operation = info->rti_mpls;
/* XXX: set experimental bits */