diff options
| author |   mpi <mpi@openbsd.org> | 2017-01-09 14:47:13 +0000 |
|---|---|---|
| committer | mpi <mpi@openbsd.org> | 2017-01-09 14:47:13 +0000 |
| commit | 50a11db7cfd72297ee10e4fbc8fb32c3cbd32a33 (patch) | |
| tree | 1fd8f422a1755b438c815af41d7847a955100277 | |
| parent | Remove unneeded <sys/malloc.h> from Michael W. Bombardieri. (diff) | |
| download | wireguard-openbsd-50a11db7cfd72297ee10e4fbc8fb32c3cbd32a33.tar.xz wireguard-openbsd-50a11db7cfd72297ee10e4fbc8fb32c3cbd32a33.zip | |
pf_purge_thread() needs the NET_LOCK().
ok sashan@, visa@
| -rw-r--r-- | sys/net/pf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/net/pf.c b/sys/net/pf.c index 45b42006431..98578708bab 100644 --- a/sys/net/pf.c +++ b/sys/net/pf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf.c,v 1.1009 2016/12/29 13:01:48 bluhm Exp $ */ +/* $OpenBSD: pf.c,v 1.1010 2017/01/09 14:47:13 mpi Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -1184,7 +1184,7 @@ pf_purge_thread(void *v) for (;;) { tsleep(pf_purge_thread, PWAIT, "pftm", 1 * hz); - s = splsoftnet(); + NET_LOCK(s); /* process a fraction of the state table every second */ pf_purge_expired_states(1 + (pf_status.states @@ -1198,7 +1198,7 @@ pf_purge_thread(void *v) nloops = 0; } - splx(s); + NET_UNLOCK(s); } } |