diff options
| author |   florian <florian@openbsd.org> | 2017-08-04 14:24:05 +0000 |
|---|---|---|
| committer | florian <florian@openbsd.org> | 2017-08-04 14:24:05 +0000 |
| commit | 2b72ec9b0f9f51600560f5884177bcd903dd31d0 (patch) | |
| tree | 450f2ae03bf77cfe7e1566a86b3d55ef7cea3e45 /sys/netinet6 | |
| parent | No need for LIST_FOREACH_SAFE, we want to remove exactly one interface (diff) | |
| download | wireguard-openbsd-2b72ec9b0f9f51600560f5884177bcd903dd31d0.tar.xz wireguard-openbsd-2b72ec9b0f9f51600560f5884177bcd903dd31d0.zip | |
We do have SO_TIMESTAMP since some time and there is other code in the
kernel that uses it without the #ifdef guard.
OK bluhm
Diffstat (limited to 'sys/netinet6')
| -rw-r--r-- | sys/netinet6/ip6_input.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c index ed8702fa71a..e200d5f1a67 100644 --- a/sys/netinet6/ip6_input.c +++ b/sys/netinet6/ip6_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip6_input.c,v 1.198 2017/07/05 11:34:10 bluhm Exp $ */ +/* $OpenBSD: ip6_input.c,v 1.199 2017/08/04 14:24:05 florian Exp $ */ /* $KAME: ip6_input.c,v 1.188 2001/03/29 05:34:31 itojun Exp $ */ /* @@ -942,7 +942,6 @@ ip6_savecontrol(struct inpcb *in6p, struct mbuf *m, struct mbuf **mp) { struct ip6_hdr *ip6 = mtod(m, struct ip6_hdr *); -#ifdef SO_TIMESTAMP if (in6p->inp_socket->so_options & SO_TIMESTAMP) { struct timeval tv; @@ -952,7 +951,6 @@ ip6_savecontrol(struct inpcb *in6p, struct mbuf *m, struct mbuf **mp) if (*mp) mp = &(*mp)->m_next; } -#endif /* RFC 2292 sec. 5 */ if ((in6p->inp_flags & IN6P_PKTINFO) != 0) { |