svn commit: r344515 - stable/12/sys/netinet

[Michael Tuexen]

Author: tuexen
Date: Mon Feb 25 12:33:11 2019
New Revision: 344515
URL: https://svnweb.freebsd.org/changeset/base/344515

Log:
  MFC r343439:
  
  Don't include two header files when not needed.
  
  This allows the part of the rewrite of TCP reassembly in this
  files to be MFCed to stable/11 with manual change.
  
  Sponsored by:		Netflix, Inc.

Modified:
  stable/12/sys/netinet/tcp_reass.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/netinet/tcp_reass.c
==============================================================================
--- stable/12/sys/netinet/tcp_reass.c	Mon Feb 25 12:25:44 2019	(r344514)
+++ stable/12/sys/netinet/tcp_reass.c	Mon Feb 25 12:33:11 2019	(r344515)
@@ -38,6 +38,10 @@ __FBSDID("$FreeBSD$");
 #include "opt_inet6.h"
 #include "opt_tcpdebug.h"
 
+/* For debugging we want counters and BB logging */
+/* #define TCP_REASS_COUNTERS 1 */
+/* #define TCP_REASS_LOGGING 1 */
+
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/eventhandler.h>
@@ -72,8 +76,10 @@ __FBSDID("$FreeBSD$");
 #include <netinet/tcp_seq.h>
 #include <netinet/tcp_timer.h>
 #include <netinet/tcp_var.h>
+#ifdef TCP_REASS_LOGGING
 #include <netinet/tcp_log_buf.h>
 #include <netinet/tcp_hpts.h>
+#endif
 #include <netinet6/tcp6_var.h>
 #include <netinet/tcpip.h>
 #ifdef TCPDEBUG
@@ -91,10 +97,6 @@ __FBSDID("$FreeBSD$");
 #define TCP_R_LOG_ZERO		9
 #define TCP_R_LOG_DUMP		10
 #define TCP_R_LOG_TRIM		11
-
-/* For debugging we want counters and BB logging */
-/* #define TCP_REASS_COUNTERS 1 */
-/* #define TCP_REASS_LOGGING 1 */
 
 static SYSCTL_NODE(_net_inet_tcp, OID_AUTO, reass, CTLFLAG_RW, 0,
     "TCP Segment Reassembly Queue");