git: 421c07013f2d - releng/12.2 - MFC r368588:

[Mark Johnston]

The branch releng/12.2 has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=421c07013f2d6de9bbd4b528897abef27c558b7e

commit 421c07013f2d6de9bbd4b528897abef27c558b7e
Author:     Kristof Provost <kp at FreeBSD.org>
AuthorDate: 2020-12-15 08:29:45 +0000
Commit:     Mark Johnston <markj at FreeBSD.org>
CommitDate: 2021-04-06 19:00:05 +0000

    MFC r368588:
    
    pf: Allow net.pf.request_maxcount to be set from loader.conf
    
    Mark request_maxcount as RWTUN so we can set it both at runtime and from
    loader.conf. This avoids users getting caught out by the change from tunable to
    run time configuration.
    
    Suggested by:   Franco Fichtner
    Approved by:    so
    Security:       FreeBSD-EN-21:06.pf
    
    (cherry picked from commit 08d13750ebdae45bcdb73d52665b823e9ba93db1)
---
 sys/netpfil/pf/pf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c
index f1d89a752f1e..bbc374365bdd 100644
--- a/sys/netpfil/pf/pf.c
+++ b/sys/netpfil/pf/pf.c
@@ -382,7 +382,7 @@ SYSCTL_ULONG(_net_pf, OID_AUTO, states_hashsize, CTLFLAG_RDTUN,
     &pf_hashsize, 0, "Size of pf(4) states hashtable");
 SYSCTL_ULONG(_net_pf, OID_AUTO, source_nodes_hashsize, CTLFLAG_RDTUN,
     &pf_srchashsize, 0, "Size of pf(4) source nodes hashtable");
-SYSCTL_ULONG(_net_pf, OID_AUTO, request_maxcount, CTLFLAG_RW,
+SYSCTL_ULONG(_net_pf, OID_AUTO, request_maxcount, CTLFLAG_RWTUN,
     &pf_ioctl_maxcount, 0, "Maximum number of tables, addresses, ... in a single ioctl() call");
 
 VNET_DEFINE(void *, pf_swi_cookie);