From owner-svn-src-all@FreeBSD.ORG Fri Jul 11 16:26:52 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0A79E611; Fri, 11 Jul 2014 16:26:52 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EA91F2B7C; Fri, 11 Jul 2014 16:26:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6BGQpLc066116; Fri, 11 Jul 2014 16:26:51 GMT (envelope-from cy@svn.freebsd.org) Received: (from cy@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6BGQpo3066115; Fri, 11 Jul 2014 16:26:51 GMT (envelope-from cy@svn.freebsd.org) Message-Id: <201407111626.s6BGQpo3066115@svn.freebsd.org> From: Cy Schubert Date: Fri, 11 Jul 2014 16:26:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r268532 - head/sys/contrib/ipfilter/netinet X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Jul 2014 16:26:52 -0000 Author: cy Date: Fri Jul 11 16:26:51 2014 New Revision: 268532 URL: http://svnweb.freebsd.org/changeset/base/268532 Log: Remove redundant USE_INET6 test that enables INET6 in the ipfilter userland regardless of the setting in make.conf. PR: 190964 Approved by: glebius (mentor) MFC after: 1 week Modified: head/sys/contrib/ipfilter/netinet/ip_compat.h Modified: head/sys/contrib/ipfilter/netinet/ip_compat.h ============================================================================== --- head/sys/contrib/ipfilter/netinet/ip_compat.h Fri Jul 11 16:16:26 2014 (r268531) +++ head/sys/contrib/ipfilter/netinet/ip_compat.h Fri Jul 11 16:26:51 2014 (r268532) @@ -33,10 +33,6 @@ #endif #define SOLARIS (defined(sun) && (defined(__svr4__) || defined(__SVR4))) -#if defined(__FreeBSD_version) && (__FreeBSD_version >= 400000) && \ - !defined(_KERNEL) && !defined(USE_INET6) && !defined(NOINET6) -# define USE_INET6 -#endif #if defined(__SVR4) || defined(__svr4__) || defined(__sgi)