git: 68efe27ffaec - stable/13 - pfsync: Add CTLFLAG_VNET to carp_demotion_factor sysctl

From: Kristof Provost <>
Date: Mon, 11 Apr 2022 14:53:17 UTC
The branch stable/13 has been updated by kp:


commit 68efe27ffaec8bec9968800f2eddeca2940b78e4
Author:     Luiz Amaral <>
AuthorDate: 2022-04-02 10:09:06 +0000
Commit:     Kristof Provost <>
CommitDate: 2022-04-11 14:52:33 +0000

    pfsync: Add CTLFLAG_VNET to carp_demotion_factor sysctl
    When trying to avoid a CARP demotion during a pfsync service restart, I
    noticed that a non-default value for the net.pfsync.carp_demotion_factor
    sysctl was not being applied during the demotion. The CARP was always
    demoted by 240.
    After investigating, I realized that the sysctl was using VNET_NAME()
    without the CTLFLAG_VNET.
    PR:             262983
    Reviewed by:    kp
    MFC after:      1 week
    Differential Revision:
    (cherry picked from commit 654c1b8ef3c0fcbad3a77ea2a6f35c0dffc86e88)
 sys/netpfil/pf/if_pfsync.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c
index b4f25728d17b..cc3c4ec0217b 100644
--- a/sys/netpfil/pf/if_pfsync.c
+++ b/sys/netpfil/pf/if_pfsync.c
@@ -278,7 +278,7 @@ SYSCTL_NODE(_net, OID_AUTO, pfsync, CTLFLAG_RW | CTLFLAG_MPSAFE, 0,
     &VNET_NAME(pfsyncstats), pfsyncstats,
     "PFSYNC statistics (struct pfsyncstats, net/if_pfsync.h)");
-SYSCTL_INT(_net_pfsync, OID_AUTO, carp_demotion_factor, CTLFLAG_RW,
+SYSCTL_INT(_net_pfsync, OID_AUTO, carp_demotion_factor, CTLFLAG_VNET | CTLFLAG_RW,
     &VNET_NAME(pfsync_carp_adj), 0, "pfsync's CARP demotion factor adjustment");
 SYSCTL_ULONG(_net_pfsync, OID_AUTO, pfsync_buckets, CTLFLAG_RDTUN,
     &pfsync_buckets, 0, "Number of pfsync hash buckets");