From owner-svn-src-all@freebsd.org  Sat Oct 15 00:29:16 2016
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 8596FC10C34;
 Sat, 15 Oct 2016 00:29:16 +0000 (UTC) (envelope-from jtl@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 55F61A05;
 Sat, 15 Oct 2016 00:29:16 +0000 (UTC) (envelope-from jtl@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u9F0TFEB054587;
 Sat, 15 Oct 2016 00:29:15 GMT (envelope-from jtl@FreeBSD.org)
Received: (from jtl@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9F0TFNS054586;
 Sat, 15 Oct 2016 00:29:15 GMT (envelope-from jtl@FreeBSD.org)
Message-Id: <201610150029.u9F0TFNS054586@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jtl set sender to jtl@FreeBSD.org
 using -f
From: "Jonathan T. Looney" <jtl@FreeBSD.org>
Date: Sat, 15 Oct 2016 00:29:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r307336 - head/sys/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.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: Sat, 15 Oct 2016 00:29:16 -0000

Author: jtl
Date: Sat Oct 15 00:29:15 2016
New Revision: 307336
URL: https://svnweb.freebsd.org/changeset/base/307336

Log:
  r307082 added the TCP_HHOOK kernel option and made some existing code only
  compile when that option is configured. In tcp_destroy(), the error
  variable is now only used in code enclosed in an '#ifdef TCP_HHOOK' block.
  This broke the build for VNET images.
  
  Enclose the error variable itself in an #ifdef block.
  
  Submitted by:	Shawn Webb <shawn.webb at hardenedbsd.org>
  Reported by:	Shawn Webb <shawn.webb at hardenedbsd.org>
  PointyHat to:	jtl

Modified:
  head/sys/netinet/tcp_subr.c

Modified: head/sys/netinet/tcp_subr.c
==============================================================================
--- head/sys/netinet/tcp_subr.c	Fri Oct 14 22:23:03 2016	(r307335)
+++ head/sys/netinet/tcp_subr.c	Sat Oct 15 00:29:15 2016	(r307336)
@@ -742,7 +742,10 @@ tcp_init(void)
 static void
 tcp_destroy(void *unused __unused)
 {
-	int error, n;
+	int n;
+#ifdef TCP_HHOOK
+	int error;
+#endif
 
 	/*
 	 * All our processes are gone, all our sockets should be cleaned