From ec274cfcb608646ce8248cb1db2c81a1d8d04286 Mon Sep 17 00:00:00 2001 From: mvs Date: Thu, 24 Nov 2022 00:04:32 +0000 Subject: [PATCH] Remove netlock assertion within PF_LOCK(). The netlock should be taken first, but only if both locks are taken. ok dlg@ sashan@ --- sys/net/pfvar_priv.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/net/pfvar_priv.h b/sys/net/pfvar_priv.h index 1d674711cf8..ec08d6c0aba 100644 --- a/sys/net/pfvar_priv.h +++ b/sys/net/pfvar_priv.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pfvar_priv.h,v 1.21 2022/11/11 17:12:30 dlg Exp $ */ +/* $OpenBSD: pfvar_priv.h,v 1.22 2022/11/24 00:04:32 mvs Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -278,7 +278,6 @@ extern struct rwlock pf_lock; extern struct rwlock pf_state_lock; #define PF_LOCK() do { \ - NET_ASSERT_LOCKED(); \ rw_enter_write(&pf_lock); \ } while (0) -- 2.20.1