summaryrefslogtreecommitdiff
path: root/sys/netinet/if_ether.c
diff options
context:
space:
mode:
authorMartin Pieuchot <mpi@cvs.openbsd.org>2017-08-11 21:24:21 +0000
committerMartin Pieuchot <mpi@cvs.openbsd.org>2017-08-11 21:24:21 +0000
commitbda0e09dc4819e6f0da56bc659a507a53ce2c49e (patch)
treeb8a35df42b1a236d2f93a31c84fab1deb17e8a67 /sys/netinet/if_ether.c
parent119ca99b6e7df0e54659d9e9b1b7f7960196ac58 (diff)
Remove NET_LOCK()'s argument.
Tested by Hrvoje Popovski, ok bluhm@
Diffstat (limited to 'sys/netinet/if_ether.c')
-rw-r--r--sys/netinet/if_ether.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c
index 9625c1fbb52..f1de465e4d3 100644
--- a/sys/netinet/if_ether.c
+++ b/sys/netinet/if_ether.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ether.c,v 1.230 2017/07/30 18:16:14 florian Exp $ */
+/* $OpenBSD: if_ether.c,v 1.231 2017/08/11 21:24:19 mpi Exp $ */
/* $NetBSD: if_ether.c,v 1.31 1996/05/11 12:59:58 mycroft Exp $ */
/*
@@ -111,9 +111,8 @@ arptimer(void *arg)
{
struct timeout *to = (struct timeout *)arg;
struct llinfo_arp *la, *nla;
- int s;
- NET_LOCK(s);
+ NET_LOCK();
timeout_add_sec(to, arpt_prune);
LIST_FOREACH_SAFE(la, &arp_list, la_list, nla) {
struct rtentry *rt = la->la_rt;
@@ -121,7 +120,7 @@ arptimer(void *arg)
if (rt->rt_expire && rt->rt_expire <= time_uptime)
arptfree(rt); /* timer has expired; clear */
}
- NET_UNLOCK(s);
+ NET_UNLOCK();
}
void