diff options
| author | guido <guido@FreeBSD.org> | 2005-12-30 11:32:23 +0000 |
|---|---|---|
| committer | guido <guido@FreeBSD.org> | 2005-12-30 11:32:23 +0000 |
| commit | 61382ac33f17a56cf1ff6a93775491b7e4950972 (patch) | |
| tree | 9d9609ac6630c945d00f5af3ce25a44c0a031d15 /sys/contrib/ipfilter/netinet/ip_log.c | |
| parent | eebd01e3004ae06a6b9dca96229fd98892943a73 (diff) | |
| download | FreeBSD-src-61382ac33f17a56cf1ff6a93775491b7e4950972.zip FreeBSD-src-61382ac33f17a56cf1ff6a93775491b7e4950972.tar.gz | |
Resolve conflicts
Diffstat (limited to 'sys/contrib/ipfilter/netinet/ip_log.c')
| -rw-r--r-- | sys/contrib/ipfilter/netinet/ip_log.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/sys/contrib/ipfilter/netinet/ip_log.c b/sys/contrib/ipfilter/netinet/ip_log.c index e42469d..36901ac 100644 --- a/sys/contrib/ipfilter/netinet/ip_log.c +++ b/sys/contrib/ipfilter/netinet/ip_log.c @@ -419,9 +419,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 @@ -541,9 +539,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 @@ -655,9 +651,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); |
