diff options
| author |   mpi <mpi@openbsd.org> | 2017-08-11 21:24:19 +0000 |
|---|---|---|
| committer | mpi <mpi@openbsd.org> | 2017-08-11 21:24:19 +0000 |
| commit | aa28b9a6d024fc39940a8bf6e59c28dbaafc6950 (patch) | |
| tree | ad38cdfb637269384ad7ff4acea0c6e8e71932a7 /sys/kern/uipc_domain.c | |
| parent | Be consistent with goto labels, failure flag and use of FAIL macro. (diff) | |
| download | wireguard-openbsd-aa28b9a6d024fc39940a8bf6e59c28dbaafc6950.tar.xz wireguard-openbsd-aa28b9a6d024fc39940a8bf6e59c28dbaafc6950.zip | |
Remove NET_LOCK()'s argument.
Tested by Hrvoje Popovski, ok bluhm@
Diffstat (limited to 'sys/kern/uipc_domain.c')
| -rw-r--r-- | sys/kern/uipc_domain.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sys/kern/uipc_domain.c b/sys/kern/uipc_domain.c index ce7091b540c..b2a43a41cd5 100644 --- a/sys/kern/uipc_domain.c +++ b/sys/kern/uipc_domain.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uipc_domain.c,v 1.51 2017/05/27 08:02:40 claudio Exp $ */ +/* $OpenBSD: uipc_domain.c,v 1.52 2017/08/11 21:24:19 mpi Exp $ */ /* $NetBSD: uipc_domain.c,v 1.14 1996/02/09 19:00:44 christos Exp $ */ /* @@ -165,7 +165,7 @@ net_sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp, void *newp, { struct domain *dp; struct protosw *pr; - int s, error, family, protocol; + int error, family, protocol; /* * All sysctl names at this level are nonterminal. @@ -207,10 +207,10 @@ net_sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp, void *newp, protocol = name[1]; for (pr = dp->dom_protosw; pr < dp->dom_protoswNPROTOSW; pr++) if (pr->pr_protocol == protocol && pr->pr_sysctl) { - NET_LOCK(s); + NET_LOCK(); error = (*pr->pr_sysctl)(name + 2, namelen - 2, oldp, oldlenp, newp, newlen); - NET_UNLOCK(s); + NET_UNLOCK(); return (error); } return (ENOPROTOOPT); @@ -238,15 +238,15 @@ pfslowtimo(void *arg) struct timeout *to = (struct timeout *)arg; struct domain *dp; struct protosw *pr; - int i, s; + int i; - NET_LOCK(s); + NET_LOCK(); for (i = 0; (dp = domains[i]) != NULL; i++) { for (pr = dp->dom_protosw; pr < dp->dom_protoswNPROTOSW; pr++) if (pr->pr_slowtimo) (*pr->pr_slowtimo)(); } - NET_UNLOCK(s); + NET_UNLOCK(); timeout_add_msec(to, 500); } @@ -256,14 +256,14 @@ pffasttimo(void *arg) struct timeout *to = (struct timeout *)arg; struct domain *dp; struct protosw *pr; - int i, s; + int i; - NET_LOCK(s); + NET_LOCK(); for (i = 0; (dp = domains[i]) != NULL; i++) { for (pr = dp->dom_protosw; pr < dp->dom_protoswNPROTOSW; pr++) if (pr->pr_fasttimo) (*pr->pr_fasttimo)(); } - NET_UNLOCK(s); + NET_UNLOCK(); timeout_add_msec(to, 200); } |