summaryrefslogtreecommitdiffstats
path: root/sys/netinet/tcp_input.c
diff options
context:
space:
mode:
authormpi <mpi@openbsd.org>2017-05-18 11:38:07 +0000
committermpi <mpi@openbsd.org>2017-05-18 11:38:07 +0000
commitb100edd3e9201518d02e494156bb3df75a62bc3b (patch)
tree3e5c4b2c5d0756989789c87bf69bd6e99c3f3693 /sys/netinet/tcp_input.c
parentThe function name ip4_input() is confusing as it also handles IPv6 (diff)
downloadwireguard-openbsd-b100edd3e9201518d02e494156bb3df75a62bc3b.tar.xz
wireguard-openbsd-b100edd3e9201518d02e494156bb3df75a62bc3b.zip
Merge the content of <netinet/tcpip.h> and <netinet6/tcpipv6.h> in
<netinet/tcp_debug.h>. The IPv6 variant was always included and the IPv4 version is not present on all systems. Most of the offending ports are already fixed, thanks to sthen@!
Diffstat (limited to 'sys/netinet/tcp_input.c')
-rw-r--r--sys/netinet/tcp_input.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
index b549bbbc3aa..724715de6d7 100644
--- a/sys/netinet/tcp_input.c
+++ b/sys/netinet/tcp_input.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tcp_input.c,v 1.344 2017/05/06 16:35:59 bluhm Exp $ */
+/* $OpenBSD: tcp_input.c,v 1.345 2017/05/18 11:38:07 mpi Exp $ */
/* $NetBSD: tcp_input.c,v 1.23 1996/02/13 23:43:44 christos Exp $ */
/*
@@ -93,7 +93,6 @@
#include <netinet/tcp_seq.h>
#include <netinet/tcp_timer.h>
#include <netinet/tcp_var.h>
-#include <netinet/tcpip.h>
#include <netinet/tcp_debug.h>
#if NPF > 0