svn commit: r307336 - head/sys/netinet

[Jonathan T. Looney]

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