svn commit: r318206 - in stable: 10/contrib/ipfilter/tools 11/contrib/ipfilter/tools

[Cy Schubert]

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

Log:
  MFC 317830:
  
  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 02:26:39 2017	(r318205)
+++ stable/10/contrib/ipfilter/tools/ippool.c	Fri May 12 02:32:01 2017	(r318206)
@@ -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);