summaryrefslogtreecommitdiff
path: root/sys/net
diff options
context:
space:
mode:
authorDavid Gwynne <dlg@cvs.openbsd.org>2018-10-29 09:51:21 +0000
committerDavid Gwynne <dlg@cvs.openbsd.org>2018-10-29 09:51:21 +0000
commitaef9d0919ffda55e5d54eaa131010ecdc149d040 (patch)
treed0152b8254579ae810a57e573307d30b2355b8f3 /sys/net
parentf43c21ae63e95205c0db05eaf544c665dbcafdb8 (diff)
use the tunnelttl in the ip6 encap too, not ip6_defhlim.
Diffstat (limited to 'sys/net')
-rw-r--r--sys/net/if_etherip.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/net/if_etherip.c b/sys/net/if_etherip.c
index 762b54b2a79..f53e4a00273 100644
--- a/sys/net/if_etherip.c
+++ b/sys/net/if_etherip.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_etherip.c,v 1.37 2018/02/19 00:29:29 dlg Exp $ */
+/* $OpenBSD: if_etherip.c,v 1.38 2018/10/29 09:51:20 dlg Exp $ */
/*
* Copyright (c) 2015 Kazuya GODA <goda@openbsd.org>
*
@@ -641,7 +641,7 @@ ip6_etherip_output(struct ifnet *ifp, struct mbuf *m)
ip6->ip6_vfc &= ~IPV6_VERSION_MASK;
ip6->ip6_vfc |= IPV6_VERSION;
ip6->ip6_nxt = IPPROTO_ETHERIP;
- ip6->ip6_hlim = ip6_defhlim;
+ ip6->ip6_hlim = sc->sc_ttl;
ip6->ip6_plen = htons(len);
memcpy(&ip6->ip6_src, &sc->sc_tunnel.t_src6, sizeof(ip6->ip6_src));
memcpy(&ip6->ip6_dst, &sc->sc_tunnel.t_dst6, sizeof(ip6->ip6_dst));