diff options
| author | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2014-10-08 20:19:59 +0000 |
|---|---|---|
| committer | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2014-10-08 20:19:59 +0000 |
| commit | a5dbdae298237e2ba3bedf9fe79ac53dafd7686a (patch) | |
| tree | 5c8bfdb9467ee64e850a2c8e0d2a28e3b8b31ea1 | |
| parent | 3a0bde45db1184b2deb9643a522da1bc33cab699 (diff) | |
Remove #ifdef SO_OOBINLINE, it is always defined.
OK henning@
| -rw-r--r-- | sys/netinet/tcp_input.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index cf74f095c08..9f782e3477f 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcp_input.c,v 1.278 2014/07/22 11:06:10 mpi Exp $ */ +/* $OpenBSD: tcp_input.c,v 1.279 2014/10/08 20:19:58 bluhm Exp $ */ /* $NetBSD: tcp_input.c,v 1.23 1996/02/13 23:43:44 christos Exp $ */ /* @@ -2061,11 +2061,8 @@ step6: * but if two URG's are pending at once, some out-of-band * data may creep in... ick. */ - if (th->th_urp <= (u_int16_t) tlen -#ifdef SO_OOBINLINE - && (so->so_options & SO_OOBINLINE) == 0 -#endif - ) + if (th->th_urp <= (u_int16_t) tlen && + (so->so_options & SO_OOBINLINE) == 0) tcp_pulloutofband(so, th->th_urp, m, hdroptlen); } else /* |