From owner-svn-src-head@freebsd.org  Sat Dec  1 20:30:19 2018
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 BB0C71326A03;
 Sat,  1 Dec 2018 20:30:19 +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 519AE72C0B;
 Sat,  1 Dec 2018 20:30:19 +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 32B7D1CAEC;
 Sat,  1 Dec 2018 20:30:19 +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 wB1KUJWt060174;
 Sat, 1 Dec 2018 20:30:19 GMT (envelope-from cy@FreeBSD.org)
Received: (from cy@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id wB1KUJC3060173;
 Sat, 1 Dec 2018 20:30:19 GMT (envelope-from cy@FreeBSD.org)
Message-Id: <201812012030.wB1KUJC3060173@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 20:30:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r341384 - head/sys/contrib/ipfilter/netinet
X-SVN-Group: head
X-SVN-Commit-Author: cy
X-SVN-Commit-Paths: head/sys/contrib/ipfilter/netinet
X-SVN-Commit-Revision: 341384
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Rspamd-Queue-Id: 519AE72C0B
X-Spamd-Result: default: False [0.62 / 15.00];
 local_wl_from(0.00)[FreeBSD.org];
 NEURAL_SPAM_SHORT(0.22)[0.218,0];
 NEURAL_SPAM_MEDIUM(0.10)[0.096,0];
 NEURAL_SPAM_LONG(0.31)[0.307,0];
 ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]
X-Rspamd-Server: mx1.freebsd.org
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 01 Dec 2018 20:30:19 -0000

Author: cy
Date: Sat Dec  1 20:30:18 2018
New Revision: 341384
URL: https://svnweb.freebsd.org/changeset/base/341384

Log:
  Remove IFF_DRVRLOCK as it is used in IRIX only (and we all know IRIX
  is dead). This includes collaterally removing code shared by HP/UX,
  SGI, and Linux, where IP Filter will in all likelihood for various
  reasons never run again.
  
  MFC after:	1 week

Modified:
  head/sys/contrib/ipfilter/netinet/ip_log.c

Modified: head/sys/contrib/ipfilter/netinet/ip_log.c
==============================================================================
--- head/sys/contrib/ipfilter/netinet/ip_log.c	Sat Dec  1 20:29:42 2018	(r341383)
+++ head/sys/contrib/ipfilter/netinet/ip_log.c	Sat Dec  1 20:30:18 2018	(r341384)
@@ -97,14 +97,8 @@ struct file;
 #include <netinet/in.h>
 #ifdef __sgi
 # include <sys/ddi.h>
-# ifdef IFF_DRVRLOCK /* IRIX6 */
-#  include <sys/hashing.h>
-# endif
 #endif
-#if !defined(__hpux) && !defined(linux) && \
-    !(defined(__sgi) && !defined(IFF_DRVRLOCK)) /*IRIX<6*/
 # include <netinet/in_var.h>
-#endif
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/tcp.h>