summaryrefslogtreecommitdiffstats
path: root/sys/netinet/tcp_timer.c
diff options
context:
space:
mode:
authordim <dim@FreeBSD.org>2016-01-22 20:41:56 +0000
committerdim <dim@FreeBSD.org>2016-01-22 20:41:56 +0000
commit7cf07624a0c8bc9de65a351f13206cea487afb48 (patch)
tree10bd7a9c1abe1f278df85958745a2a09074c1dda /sys/netinet/tcp_timer.c
parentf011e361d3e821edf47ec30d69116ed25a05b696 (diff)
parent66dd616ca8c4d3779be38f549e7e793674dbfd03 (diff)
downloadFreeBSD-src-7cf07624a0c8bc9de65a351f13206cea487afb48.zip
FreeBSD-src-7cf07624a0c8bc9de65a351f13206cea487afb48.tar.gz
Merge ^/head r294169 through r294598.
Diffstat (limited to 'sys/netinet/tcp_timer.c')
-rw-r--r--sys/netinet/tcp_timer.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/netinet/tcp_timer.c b/sys/netinet/tcp_timer.c
index fb4ff11..0dfeb13 100644
--- a/sys/netinet/tcp_timer.c
+++ b/sys/netinet/tcp_timer.c
@@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$");
#include <net/vnet.h>
#include <net/netisr.h>
-#include <netinet/cc.h>
#include <netinet/in.h>
#include <netinet/in_kdtrace.h>
#include <netinet/in_pcb.h>
@@ -65,9 +64,11 @@ __FBSDID("$FreeBSD$");
#include <netinet6/in6_pcb.h>
#endif
#include <netinet/ip_var.h>
+#include <netinet/tcp.h>
#include <netinet/tcp_fsm.h>
#include <netinet/tcp_timer.h>
#include <netinet/tcp_var.h>
+#include <netinet/tcp_cc.h>
#ifdef INET6
#include <netinet6/tcp6_var.h>
#endif
OpenPOWER on IntegriCloud