diff options
| author |   mpi <mpi@openbsd.org> | 2016-11-16 08:46:05 +0000 |
|---|---|---|
| committer | mpi <mpi@openbsd.org> | 2016-11-16 08:46:05 +0000 |
| commit | a7d48ceceecd4eaf16e108cc08ee5e8e090bcc90 (patch) | |
| tree | f1be6d15c2bacc41ea7a35f4e964d7198da7d662 /sys/net/pf_ioctl.c | |
| parent | regen (diff) | |
| download | wireguard-openbsd-a7d48ceceecd4eaf16e108cc08ee5e8e090bcc90.tar.xz wireguard-openbsd-a7d48ceceecd4eaf16e108cc08ee5e8e090bcc90.zip | |
Kill recursive splsoftnet()s.
ok bluhm@
Diffstat (limited to 'sys/net/pf_ioctl.c')
| -rw-r--r-- | sys/net/pf_ioctl.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/net/pf_ioctl.c b/sys/net/pf_ioctl.c index 82bc2ed1269..9a478bafe09 100644 --- a/sys/net/pf_ioctl.c +++ b/sys/net/pf_ioctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf_ioctl.c,v 1.304 2016/10/28 07:54:19 sashan Exp $ */ +/* $OpenBSD: pf_ioctl.c,v 1.305 2016/11/16 08:46:05 mpi Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -769,7 +769,7 @@ pf_commit_rules(u_int32_t ticket, char *anchor) struct pf_ruleset *rs; struct pf_rule *rule, **old_array; struct pf_rulequeue *old_rules; - int s, error; + int error; u_int32_t old_rcount; /* Make sure any expired rules get removed from active rules first. */ @@ -788,7 +788,6 @@ pf_commit_rules(u_int32_t ticket, char *anchor) } /* Swap rules, keep the old. */ - s = splsoftnet(); old_rules = rs->rules.active.ptr; old_rcount = rs->rules.active.rcount; old_array = rs->rules.active.ptr_array; @@ -813,7 +812,6 @@ pf_commit_rules(u_int32_t ticket, char *anchor) rs->rules.inactive.rcount = 0; rs->rules.inactive.open = 0; pf_remove_if_empty_ruleset(rs); - splx(s); /* queue defs only in the main ruleset */ if (anchor[0]) |