From: kn <kn@openbsd.org>
Date: Fri, 28 Apr 2023 10:19:35 +0000 (+0000)
Subject: Remove net lock from DIOCGETQUEUES
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=690ccfe1a45a40f03d1b053392b7e2f22002ae73;p=openbsd

Remove net lock from DIOCGETQUEUES

Both ticket and number of queues stem from the pf_queues_active list which
is effectively static to pf_ioctl.c and fully protected by the pf lock.

OK sashan
---

diff --git a/sys/net/pf_ioctl.c b/sys/net/pf_ioctl.c
index b427365c362..c95cc52e6ec 100644
--- a/sys/net/pf_ioctl.c
+++ b/sys/net/pf_ioctl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pf_ioctl.c,v 1.399 2023/04/27 12:10:30 kn Exp $ */
+/*	$OpenBSD: pf_ioctl.c,v 1.400 2023/04/28 10:19:35 kn Exp $ */
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -1185,7 +1185,6 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
 		struct pf_queuespec	*qs;
 		u_int32_t		 nr = 0;
 
-		NET_LOCK();
 		PF_LOCK();
 		pq->ticket = pf_main_ruleset.rules.active.ticket;
 
@@ -1197,7 +1196,6 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
 		}
 		pq->nr = nr;
 		PF_UNLOCK();
-		NET_UNLOCK();
 		break;
 	}