summaryrefslogtreecommitdiff
path: root/sys/net
diff options
context:
space:
mode:
authorDavid Gwynne <dlg@cvs.openbsd.org>2019-04-17 01:57:22 +0000
committerDavid Gwynne <dlg@cvs.openbsd.org>2019-04-17 01:57:22 +0000
commit18ebdfe8d4e86b35f706920b5eb63704075a3fd5 (patch)
tree20ca25133aa5e15339b47c0e66f0522cba40ecd9 /sys/net
parent41c26d433be81dc214a82aa2473e001454483d96 (diff)
don't lose the TTL on FAT labels
Diffstat (limited to 'sys/net')
-rw-r--r--sys/net/if_mpw.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/net/if_mpw.c b/sys/net/if_mpw.c
index f75b22d9640..b80f21518d3 100644
--- a/sys/net/if_mpw.c
+++ b/sys/net/if_mpw.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_mpw.c,v 1.50 2019/04/17 00:45:03 dlg Exp $ */
+/* $OpenBSD: if_mpw.c,v 1.51 2019/04/17 01:57:21 dlg Exp $ */
/*
* Copyright (c) 2015 Rafael Zalamena <rzalamena@openbsd.org>
@@ -694,7 +694,7 @@ mpw_start(struct ifnet *ifp)
shim = mtod(m0, struct shim_hdr *);
shim->shim_label = htonl(1) & MPLS_TTL_MASK;
- shim->shim_label = MPLS_LABEL2SHIM(flow) | exp | bos;
+ shim->shim_label |= MPLS_LABEL2SHIM(flow) | exp | bos;
bos = 0;
}