diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2017-05-29 14:18:33 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2017-05-29 14:18:33 +0000 |
| commit | 3074148f150ad1764336ec65e48c9c96ac9404c9 (patch) | |
| tree | 35f2e3712e1fac5a78a5f384e31a51d604ccb925 /sys/net | |
| parent | c39c3aea481a2d9ebeaf9876732f190a0ab559fd (diff) | |
export_pflow() is no longer grabbing the NET_LOCK(), so no need to
release it beforehand.
ok henning@, benno@
Diffstat (limited to 'sys/net')
| -rw-r--r-- | sys/net/pf.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sys/net/pf.c b/sys/net/pf.c index a0f3feac155..35482602050 100644 --- a/sys/net/pf.c +++ b/sys/net/pf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf.c,v 1.1030 2017/05/28 16:55:54 bluhm Exp $ */ +/* $OpenBSD: pf.c,v 1.1031 2017/05/29 14:18:32 mpi Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -1320,12 +1320,8 @@ pf_remove_state(struct pf_state *cur) } RB_REMOVE(pf_state_tree_id, &tree_id, cur); #if NPFLOW > 0 - if (cur->state_flags & PFSTATE_PFLOW) { - /* XXXSMP breaks atomicity */ - rw_exit_write(&netlock); + if (cur->state_flags & PFSTATE_PFLOW) export_pflow(cur); - rw_enter_write(&netlock); - } #endif /* NPFLOW > 0 */ #if NPFSYNC > 0 pfsync_delete_state(cur); |