diff options
| author | Guido van Rooij <guido@FreeBSD.org> | 2005-12-30 11:22:11 +0000 |
|---|---|---|
| committer | Guido van Rooij <guido@FreeBSD.org> | 2005-12-30 11:22:11 +0000 |
| commit | fc79eaf127b2927f108bf1971bfb850f7dabea63 (patch) | |
| tree | b7932fb536591098a7a0c82617edb30ea41453b7 /sys/contrib/ipfilter/netinet/ip_log.c | |
| parent | 8158c4468d2bf40eabe8e413f647e1dd581bb6e7 (diff) | |
| download | src-fc79eaf127b2927f108bf1971bfb850f7dabea63.tar.gz src-fc79eaf127b2927f108bf1971bfb850f7dabea63.zip | |
Import IP Filter version 4.1.10
Notes
Notes:
svn path=/vendor-sys/ipfilter/dist/; revision=153872
Diffstat (limited to 'sys/contrib/ipfilter/netinet/ip_log.c')
| -rw-r--r-- | sys/contrib/ipfilter/netinet/ip_log.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/sys/contrib/ipfilter/netinet/ip_log.c b/sys/contrib/ipfilter/netinet/ip_log.c index 804f7c7c23fb..6618c6d6d841 100644 --- a/sys/contrib/ipfilter/netinet/ip_log.c +++ b/sys/contrib/ipfilter/netinet/ip_log.c @@ -1,11 +1,9 @@ -/* $FreeBSD$ */ - /* * Copyright (C) 1997-2003 by Darren Reed. * * See the IPFILTER.LICENCE file for details on licencing. * - * Id: ip_log.c,v 2.75.2.6 2004/10/16 07:59:27 darrenr Exp + * $Id: ip_log.c,v 2.75.2.7 2005/06/11 07:47:44 darrenr Exp $ */ #include <sys/param.h> #if defined(KERNEL) || defined(_KERNEL) @@ -416,9 +414,7 @@ int *types, cnt; iplog_t *ipl; size_t len; int i; -# if defined(_KERNEL) && !defined(MENTAT) && defined(USE_SPL) - int s; -# endif + SPL_INT(s); /* * Check to see if this log record has a CRC which matches the last @@ -538,9 +534,7 @@ struct uio *uio; size_t dlen, copied; int error = 0; iplog_t *ipl; -# if defined(_KERNEL) && !defined(MENTAT) && defined(USE_SPL) - int s; -# endif + SPL_INT(s); /* * Sanity checks. Make sure the minor # is valid and we're copying @@ -652,9 +646,7 @@ minor_t unit; { iplog_t *ipl; int used; -# if defined(_KERNEL) && !defined(MENTAT) && defined(USE_SPL) - int s; -# endif + SPL_INT(s); SPL_NET(s); MUTEX_ENTER(&ipl_mutex); |