From owner-svn-src-stable-10@freebsd.org  Sat Dec  1 18:17:52 2018
Return-Path: <owner-svn-src-stable-10@freebsd.org>
Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9F60C1323E28;
 Sat,  1 Dec 2018 18:17:52 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 447AE6EEC7;
 Sat,  1 Dec 2018 18:17:52 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 270FD1B5B7;
 Sat,  1 Dec 2018 18:17:52 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wB1IHq6m093627;
 Sat, 1 Dec 2018 18:17:52 GMT (envelope-from cy@FreeBSD.org)
Received: (from cy@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id wB1IHq9g093626;
 Sat, 1 Dec 2018 18:17:52 GMT (envelope-from cy@FreeBSD.org)
Message-Id: <201812011817.wB1IHq9g093626@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org
 using -f
From: Cy Schubert <cy@FreeBSD.org>
Date: Sat, 1 Dec 2018 18:17:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r341379 - in stable: 10/sys/contrib/ipfilter/netinet
 11/sys/contrib/ipfilter/netinet 12/sys/contrib/ipfilter/netinet
X-SVN-Group: stable-10
X-SVN-Commit-Author: cy
X-SVN-Commit-Paths: in stable: 10/sys/contrib/ipfilter/netinet
 11/sys/contrib/ipfilter/netinet 12/sys/contrib/ipfilter/netinet
X-SVN-Commit-Revision: 341379
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Rspamd-Queue-Id: 447AE6EEC7
X-Spamd-Result: default: False [0.71 / 15.00];
 local_wl_from(0.00)[FreeBSD.org];
 NEURAL_SPAM_LONG(0.26)[0.262,0];
 NEURAL_SPAM_MEDIUM(0.03)[0.035,0];
 ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US];
 NEURAL_SPAM_SHORT(0.41)[0.408,0]
X-Rspamd-Server: mx1.freebsd.org
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 01 Dec 2018 18:17:52 -0000

Author: cy
Date: Sat Dec  1 18:17:51 2018
New Revision: 341379
URL: https://svnweb.freebsd.org/changeset/base/341379

Log:
  MFC r340868:
  
  An OSF/1 ifdef makes absolutley no sense in a FreeBSD specific source
  file.

Modified:
  stable/10/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
Directory Properties:
  stable/10/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/11/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
  stable/12/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
Directory Properties:
  stable/11/   (props changed)
  stable/12/   (props changed)

Modified: stable/10/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
==============================================================================
--- stable/10/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c	Sat Dec  1 18:09:17 2018	(r341378)
+++ stable/10/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c	Sat Dec  1 18:17:51 2018	(r341379)
@@ -61,9 +61,6 @@ static const char rcsid[] = "@(#)$Id$";
 #define CURVNET_SET(arg)
 #define CURVNET_RESTORE()
 #endif
-#if defined(__osf__)
-# include <netinet/tcp_timer.h>
-#endif
 #include <netinet/udp.h>
 #include <netinet/tcpip.h>
 #include <netinet/ip_icmp.h>