summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoritojun <itojun@openbsd.org>1999-12-13 10:41:56 +0000
committeritojun <itojun@openbsd.org>1999-12-13 10:41:56 +0000
commitcc46d976775b78905ad590baa3ffe165b46cf42f (patch)
tree6346e6d809f6574ad3077d10dca8ca1ad66c6325
parent(hopefully) fix pauses reported by ES1370 users (diff)
downloadwireguard-openbsd-cc46d976775b78905ad590baa3ffe165b46cf42f.tar.xz
wireguard-openbsd-cc46d976775b78905ad590baa3ffe165b46cf42f.zip
remove extra checks for #define INET (merged mistakingly from kame).
this is harmful against some of lkm compilation.
-rw-r--r--sys/netinet/ip_auth.c9
-rw-r--r--sys/netinet/ip_fil.c9
-rw-r--r--sys/netinet/ip_frag.c9
3 files changed, 6 insertions, 21 deletions
diff --git a/sys/netinet/ip_auth.c b/sys/netinet/ip_auth.c
index ea64528f34e..0de609a5b2d 100644
--- a/sys/netinet/ip_auth.c
+++ b/sys/netinet/ip_auth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_auth.c,v 1.7 1999/12/08 06:50:19 itojun Exp $ */
+/* $OpenBSD: ip_auth.c,v 1.8 1999/12/13 10:41:56 itojun Exp $ */
/*
* Copyright (C) 1998 by Darren Reed & Guido van Rooij.
*
@@ -7,7 +7,7 @@
* to the original author and the contributors.
*/
#if !defined(lint)
-static const char rcsid[] = "@(#)$Id: ip_auth.c,v 1.7 1999/12/08 06:50:19 itojun Exp $";
+static const char rcsid[] = "@(#)$Id: ip_auth.c,v 1.8 1999/12/13 10:41:56 itojun Exp $";
#endif
#include <sys/errno.h>
@@ -53,11 +53,6 @@ static const char rcsid[] = "@(#)$Id: ip_auth.c,v 1.7 1999/12/08 06:50:19 itojun
#include <net/af.h>
#endif
#include <net/route.h>
-#ifdef _KERNEL
-#ifndef INET
-#error ipfilter assumes options INET
-#endif
-#endif
#include <netinet/in.h>
#include <netinet/in_systm.h>
#include <netinet/ip.h>
diff --git a/sys/netinet/ip_fil.c b/sys/netinet/ip_fil.c
index b0d51cf2f43..95428bf29f9 100644
--- a/sys/netinet/ip_fil.c
+++ b/sys/netinet/ip_fil.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_fil.c,v 1.25 1999/12/08 06:50:19 itojun Exp $ */
+/* $OpenBSD: ip_fil.c,v 1.26 1999/12/13 10:41:56 itojun Exp $ */
/*
* Copyright (C) 1993-1998 by Darren Reed.
*
@@ -8,7 +8,7 @@
*/
#if !defined(lint)
static const char sccsid[] = "@(#)ip_fil.c 2.41 6/5/96 (C) 1993-1995 Darren Reed";
-static const char rcsid[] = "@(#)$Id: ip_fil.c,v 1.25 1999/12/08 06:50:19 itojun Exp $";
+static const char rcsid[] = "@(#)$Id: ip_fil.c,v 1.26 1999/12/13 10:41:56 itojun Exp $";
#endif
#ifndef SOLARIS
@@ -73,11 +73,6 @@ static const char rcsid[] = "@(#)$Id: ip_fil.c,v 1.25 1999/12/08 06:50:19 itojun
# endif
#endif
#include <net/route.h>
-#ifdef _KERNEL
-#ifndef INET
-#error ipfilter assumes options INET
-#endif
-#endif
#include <netinet/in.h>
#if !(defined(__sgi) && !defined(IFF_DRVRLOCK)) /* IRIX < 6 */
#include <netinet/in_var.h>
diff --git a/sys/netinet/ip_frag.c b/sys/netinet/ip_frag.c
index d7f1a39f030..ef679f3f798 100644
--- a/sys/netinet/ip_frag.c
+++ b/sys/netinet/ip_frag.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_frag.c,v 1.12 1999/12/08 06:50:19 itojun Exp $ */
+/* $OpenBSD: ip_frag.c,v 1.13 1999/12/13 10:41:56 itojun Exp $ */
/*
* Copyright (C) 1993-1998 by Darren Reed.
*
@@ -8,7 +8,7 @@
*/
#if !defined(lint)
static const char sccsid[] = "@(#)ip_frag.c 1.11 3/24/96 (C) 1993-1995 Darren Reed";
-static const char rcsid[] = "@(#)$Id: ip_frag.c,v 1.12 1999/12/08 06:50:19 itojun Exp $";
+static const char rcsid[] = "@(#)$Id: ip_frag.c,v 1.13 1999/12/13 10:41:56 itojun Exp $";
#endif
#include <sys/errno.h>
@@ -51,11 +51,6 @@ static const char rcsid[] = "@(#)$Id: ip_frag.c,v 1.12 1999/12/08 06:50:19 itoju
#include <net/af.h>
#endif
#include <net/route.h>
-#ifdef _KERNEL
-#ifndef INET
-#error ipfilter assumes options INET
-#endif
-#endif
#include <netinet/in.h>
#include <netinet/in_systm.h>
#include <netinet/ip.h>