summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorflorian <florian@openbsd.org>2017-10-29 14:58:39 +0000
committerflorian <florian@openbsd.org>2017-10-29 14:58:39 +0000
commitc5651e2fb0f8b427b17cd1b14beb060a86243b78 (patch)
tree21ff3dd962829b45c32e673bc7a6de99e8901d7b
parentMove NET_{,UN}LOCK into individual slowtimo functions. (diff)
downloadwireguard-openbsd-c5651e2fb0f8b427b17cd1b14beb060a86243b78.tar.xz
wireguard-openbsd-c5651e2fb0f8b427b17cd1b14beb060a86243b78.zip
This doesn't need the NET_LOCK, everything is protected by a mutex.
OK mpi, visa
-rw-r--r--sys/netinet/ip_input.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index 8808d5cb2f0..ec0fff49ef3 100644
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_input.c,v 1.325 2017/10/29 14:56:36 florian Exp $ */
+/* $OpenBSD: ip_input.c,v 1.326 2017/10/29 14:58:39 florian Exp $ */
/* $NetBSD: ip_input.c,v 1.30 1996/03/16 23:53:58 christos Exp $ */
/*
@@ -1028,7 +1028,6 @@ ip_slowtimo(void)
{
struct ipq *fp, *nfp;
- NET_LOCK();
mtx_enter(&ipq_mutex);
LIST_FOREACH_SAFE(fp, &ipq, ipq_q, nfp) {
if (--fp->ipq_ttl == 0) {
@@ -1037,7 +1036,6 @@ ip_slowtimo(void)
}
}
mtx_leave(&ipq_mutex);
- NET_UNLOCK();
}
/*