summaryrefslogtreecommitdiffstats
path: root/sys/netinet/ip_frag.c
diff options
context:
space:
mode:
authorguido <guido@FreeBSD.org>2000-02-09 20:56:36 +0000
committerguido <guido@FreeBSD.org>2000-02-09 20:56:36 +0000
commit2fb4ae435fb81cf80118686a2955f9c3f4ef8e23 (patch)
tree3d20f7e5c636b91e4f4bbaccef1029fdcf11fb85 /sys/netinet/ip_frag.c
parent0af99ab61af5d653b7d579370f26db7241b9aeae (diff)
downloadFreeBSD-src-2fb4ae435fb81cf80118686a2955f9c3f4ef8e23.zip
FreeBSD-src-2fb4ae435fb81cf80118686a2955f9c3f4ef8e23.tar.gz
Bring over ipfilter v3_3_8 kernel sources, including merging the
local modifications. Also fix initializing fr_running in KLD case. Rename ipl_inited to fr_runninhg in mlfk_ipl Approved by: jkh
Diffstat (limited to 'sys/netinet/ip_frag.c')
-rw-r--r--sys/netinet/ip_frag.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/netinet/ip_frag.c b/sys/netinet/ip_frag.c
index 54f5a84..168368a 100644
--- a/sys/netinet/ip_frag.c
+++ b/sys/netinet/ip_frag.c
@@ -7,8 +7,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 2.4.2.4 1999/11/28 04:52:10 darrenr Exp $";*/
-static const char rcsid[] = "@(#)$FreeBSD$";
+static const char rcsid[] = "@(#)$Id: ip_frag.c,v 2.4.2.4 1999/11/28 04:52:10 darrenr Exp $";
#endif
#if defined(KERNEL) && !defined(_KERNEL)
@@ -25,8 +24,7 @@ static const char rcsid[] = "@(#)$FreeBSD$";
# include <string.h>
# include <stdlib.h>
#endif
-#if ((defined(KERNEL) && (__FreeBSD_version >= 220000)) || \
- (defined(_KERNEL) && (__FreeBSD_version >= 40013)))
+#if defined(_KERNEL) && (__FreeBSD_version >= 220000)
# include <sys/filio.h>
# include <sys/fcntl.h>
#else
OpenPOWER on IntegriCloud