From owner-svn-src-head@freebsd.org  Wed May 24 14:36:53 2017
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:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7227DD7B83B;
 Wed, 24 May 2017 14:36:53 +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 3F455167D;
 Wed, 24 May 2017 14:36:53 +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 v4OEaq2Q057611;
 Wed, 24 May 2017 14:36:52 GMT (envelope-from cy@FreeBSD.org)
Received: (from cy@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4OEaq6k057610;
 Wed, 24 May 2017 14:36:52 GMT (envelope-from cy@FreeBSD.org)
Message-Id: <201705241436.v4OEaq6k057610@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: Wed, 24 May 2017 14:36:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r318789 - 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-head@freebsd.org
X-Mailman-Version: 2.1.23
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: Wed, 24 May 2017 14:36:53 -0000

Author: cy
Date: Wed May 24 14:36:51 2017
New Revision: 318789
URL: https://svnweb.freebsd.org/changeset/base/318789

Log:
  Ifdef out a redundant if statement when LARGE_NAT is disabled.
  
  MFC after:	1 week

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

Modified: head/sys/contrib/ipfilter/netinet/ip_nat.c
==============================================================================
--- head/sys/contrib/ipfilter/netinet/ip_nat.c	Wed May 24 14:24:47 2017	(r318788)
+++ head/sys/contrib/ipfilter/netinet/ip_nat.c	Wed May 24 14:36:51 2017	(r318789)
@@ -497,7 +497,9 @@ ipf_nat_soft_init(softc, arg)
 	softn->ipf_nat_pending.ifq_next = NULL;
 
 	for (i = 0, tq = softn->ipf_nat_tcptq; i < IPF_TCP_NSTATES; i++, tq++) {
+#ifdef LARGE_NAT
 		if (tq->ifq_ttl < softn->ipf_nat_deficmpage)
+#endif
 			tq->ifq_ttl = softn->ipf_nat_deficmpage;
 #ifdef LARGE_NAT
 		else if (tq->ifq_ttl > softn->ipf_nat_defage)