git: 476f61217b7b - main - pf: fix build without VIMAGE

The branch main has been updated by kp:

URL: https://cgit.FreeBSD.org/src/commit/?id=476f61217b7ba879f2d7bd2c297b4852d8b403f8

commit 476f61217b7ba879f2d7bd2c297b4852d8b403f8
Author:     Kristof Provost <kp@FreeBSD.org>
AuthorDate: 2023-06-20 11:20:11 +0000
Commit:     Kristof Provost <kp@FreeBSD.org>
CommitDate: 2023-06-20 11:20:11 +0000

    pf: fix build without VIMAGE
    
    Remove the name conflict between the pfsync_defer_tmo variable and
    function.
    
    This worked fine in kernels with VIMAGE (the default), but not in those
    without.
    
    Reported by:    des@
    Sponsored by:   Rubicon Communications, LLC ("Netgate")
---
 sys/netpfil/pf/if_pfsync.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c
index 61f2dcba1767..2af0b57eba45 100644
--- a/sys/netpfil/pf/if_pfsync.c
+++ b/sys/netpfil/pf/if_pfsync.c
@@ -295,8 +295,8 @@ VNET_DEFINE_STATIC(struct pfsyncstats, pfsyncstats);
 #define	V_pfsyncstats		VNET(pfsyncstats)
 VNET_DEFINE_STATIC(int, pfsync_carp_adj) = CARP_MAXSKEW;
 #define	V_pfsync_carp_adj	VNET(pfsync_carp_adj)
-VNET_DEFINE_STATIC(unsigned int, pfsync_defer_tmo) = PFSYNC_DEFER_TIMEOUT;
-#define	V_pfsync_defer_tmo	VNET(pfsync_defer_tmo)
+VNET_DEFINE_STATIC(unsigned int, pfsync_defer_timeout) = PFSYNC_DEFER_TIMEOUT;
+#define	V_pfsync_defer_timeout	VNET(pfsync_defer_timeout)
 
 static void	pfsync_timeout(void *);
 static void	pfsync_push(struct pfsync_bucket *);
@@ -322,7 +322,7 @@ SYSCTL_INT(_net_pfsync, OID_AUTO, carp_demotion_factor, CTLFLAG_VNET | CTLFLAG_R
 SYSCTL_ULONG(_net_pfsync, OID_AUTO, pfsync_buckets, CTLFLAG_RDTUN,
     &pfsync_buckets, 0, "Number of pfsync hash buckets");
 SYSCTL_UINT(_net_pfsync, OID_AUTO, defer_delay, CTLFLAG_VNET | CTLFLAG_RW,
-    &VNET_NAME(pfsync_defer_tmo), 0, "Deferred packet timeout (in ms)");
+    &VNET_NAME(pfsync_defer_timeout), 0, "Deferred packet timeout (in ms)");
 
 static int	pfsync_clone_create(struct if_clone *, int, caddr_t);
 static void	pfsync_clone_destroy(struct ifnet *);
@@ -1887,7 +1887,7 @@ pfsync_defer(struct pf_kstate *st, struct mbuf *m)
 
 	TAILQ_INSERT_TAIL(&b->b_deferrals, pd, pd_entry);
 	callout_init_mtx(&pd->pd_tmo, &b->b_mtx, CALLOUT_RETURNUNLOCKED);
-	callout_reset(&pd->pd_tmo, (V_pfsync_defer_tmo * hz) / 1000,
+	callout_reset(&pd->pd_tmo, (V_pfsync_defer_timeout * hz) / 1000,
 	    pfsync_defer_tmo, pd);
 
 	pfsync_push(b);