From owner-svn-src-all@freebsd.org  Fri May 12 02:12:05 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 83F8AD67EA7;
 Fri, 12 May 2017 02:12:05 +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 mx1.freebsd.org (Postfix) with ESMTPS id 55936CA4;
 Fri, 12 May 2017 02:12:05 +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 v4C2C4ed064987;
 Fri, 12 May 2017 02:12:04 GMT (envelope-from cy@FreeBSD.org)
Received: (from cy@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4C2C4hm064986;
 Fri, 12 May 2017 02:12:04 GMT (envelope-from cy@FreeBSD.org)
Message-Id: <201705120212.v4C2C4hm064986@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: Fri, 12 May 2017 02:12:04 +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: r318203 - in stable: 10/contrib/ipfilter/tools
 11/contrib/ipfilter/tools
X-SVN-Group: stable-10
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.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 12 May 2017 02:12:05 -0000

Author: cy
Date: Fri May 12 02:12:03 2017
New Revision: 318203
URL: https://svnweb.freebsd.org/changeset/base/318203

Log:
  Ifdef out a redundant if statement when INET6 is disabled.

Modified:
  stable/10/contrib/ipfilter/tools/ippool.c
Directory Properties:
  stable/10/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/11/contrib/ipfilter/tools/ippool.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/10/contrib/ipfilter/tools/ippool.c
==============================================================================
--- stable/10/contrib/ipfilter/tools/ippool.c	Fri May 12 01:09:24 2017	(r318202)
+++ stable/10/contrib/ipfilter/tools/ippool.c	Fri May 12 02:12:03 2017	(r318203)
@@ -1050,7 +1050,9 @@ setnodeaddr(int type, int role, void *pt
 	if (type == IPLT_POOL) {
 		ip_pool_node_t *node = ptr;
 
+#ifdef USE_INET6
 		if (node->ipn_addr.adf_family == AF_INET)
+#endif
 			node->ipn_addr.adf_len = offsetof(addrfamily_t,
 							  adf_addr) +
 						 sizeof(struct in_addr);