diff options
| author | Florian Obser <florian@cvs.openbsd.org> | 2017-08-04 14:24:06 +0000 |
|---|---|---|
| committer | Florian Obser <florian@cvs.openbsd.org> | 2017-08-04 14:24:06 +0000 |
| commit | c246f00532686be947a29e148358d33931d197f8 (patch) | |
| tree | c19c55062b791c5ebce240ccfeb974dc7155d226 /sys/netinet | |
| parent | 2965ed0135e80428a7d5230b130b32c69d880893 (diff) | |
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/netinet')
| -rw-r--r-- | sys/netinet/ip_input.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index ee74eeadc4c..3f74687177d 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_input.c,v 1.315 2017/07/05 14:47:58 visa Exp $ */ +/* $OpenBSD: ip_input.c,v 1.316 2017/08/04 14:24:05 florian Exp $ */ /* $NetBSD: ip_input.c,v 1.30 1996/03/16 23:53:58 christos Exp $ */ /* @@ -1711,7 +1711,6 @@ void ip_savecontrol(struct inpcb *inp, struct mbuf **mp, struct ip *ip, struct mbuf *m) { -#ifdef SO_TIMESTAMP if (inp->inp_socket->so_options & SO_TIMESTAMP) { struct timeval tv; @@ -1721,7 +1720,7 @@ ip_savecontrol(struct inpcb *inp, struct mbuf **mp, struct ip *ip, if (*mp) mp = &(*mp)->m_next; } -#endif + if (inp->inp_flags & INP_RECVDSTADDR) { *mp = sbcreatecontrol((caddr_t) &ip->ip_dst, sizeof(struct in_addr), IP_RECVDSTADDR, IPPROTO_IP); |