From a5dbdae298237e2ba3bedf9fe79ac53dafd7686a Mon Sep 17 00:00:00 2001
From: Alexander Bluhm <bluhm@cvs.openbsd.org>
Date: Wed, 8 Oct 2014 20:19:59 +0000
Subject: Remove #ifdef SO_OOBINLINE, it is always defined. OK henning@

---
 sys/netinet/tcp_input.c | 9 +++------
 1 file 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
 		/*
-- 
cgit v1.2.3