From nobody Tue Jun 20 11:21:40 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Qlkjc4hwCz4gKTN; Tue, 20 Jun 2023 11:21:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qlkjc4Bl9z42ML; Tue, 20 Jun 2023 11:21:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687260100; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pJwWaeO8pGfhSjcBGS9ST4J9iP4gZb7JzqCMh9mDz3w=; b=CsoSz4rutxDeTmIdsIX5LA5cFf3AlN7kT1tFX4DZldEcHjE7Ms3/2lUC2lvnLHo9UECxUy Ay+drpsEOfqifQbSdD5xZ3a8ZD7uRxmXimBxb514lLGUHdNKHOBy6r+gsp+gnQN1Tvn1UO r0jVpUpY9sYlrRl3x1+Y/ckczfmeFktbMqPLon+ZsWSxsQeJHx293md+2tSEK7Li9GA/vD DTRyKr/RgOvVtCRuBnSt/FcwFq7TW0zYHazzseaZ2qi9tUQBumZAq5h/W0uL4dyzitvfvP xUwHfBVCznd0t6J5bnEK+SWjwhKdvmAYrP8u3/OObcb0kckc2QUAKgfLSgWBEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687260100; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pJwWaeO8pGfhSjcBGS9ST4J9iP4gZb7JzqCMh9mDz3w=; b=sYhX4xxIG7AXnMHRVUBnELij5xVFyH27YbRkfUdXOOJ9JtMrAKdcnYSIe8lnzICs1ptFf+ /CFqDWoj+EhnG4Yd5yB6474YLuEunK3hjeLRvjhOjJXeQGDMS5SAyMWfBGnLSKnW/G/7n2 7qP12kVX7etyVt2uK093GIqnUeB/Mye+Jw2gps4QkkSgVVgMk4tuv8pH+/U38Yv+r9+l7P iLAd64dr3MxN3rDctzG5J4mOqXYNbOc28JxPofQNRWpSumSlHo4rzQmvbQkk0Kj6BnofBl v4T2c2cZm512ubZSmYqZnxiWMKAskwP1nVlAAtZayW/tVl3XOsOCJr9OX4wfqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687260100; a=rsa-sha256; cv=none; b=pt6EHDkHhXaD1bpC/zlSKu5db3w4g+mqE4o8TABjzpNeW0/S6ekrI9+qLReJOCen1fRqZS s+cnhNuFUKSmn6yykObvJn1xjLXbnJ5OmKcywkNuAQ5MfCqdo76eQ/2q4+AXKysQPnmViS 96TneOm1cTTqD0eQrz2lKyxS7oykppYgIz836i7qHr/FEr3XZ7Vgp3+mxEPbeBjGQ4SR1g eNAj5JqMTMo2Se9p6udJnUWMPq90vjvq53hjyjv9RcYlHMZ/8q3YdgnrKJDW+kwqIfmiq6 jGZnQ4x6AwHQi5hNzA5On5Cfp5fJ656Qj4BI/afyALjX247Y4BLz40xlGxwGiQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Qlkjc2zlyzxLS; Tue, 20 Jun 2023 11:21:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35KBLeWY045014; Tue, 20 Jun 2023 11:21:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35KBLeNI045013; Tue, 20 Jun 2023 11:21:40 GMT (envelope-from git) Date: Tue, 20 Jun 2023 11:21:40 GMT Message-Id: <202306201121.35KBLeNI045013@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 476f61217b7b - main - pf: fix build without VIMAGE List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 476f61217b7ba879f2d7bd2c297b4852d8b403f8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=476f61217b7ba879f2d7bd2c297b4852d8b403f8 commit 476f61217b7ba879f2d7bd2c297b4852d8b403f8 Author: Kristof Provost AuthorDate: 2023-06-20 11:20:11 +0000 Commit: Kristof Provost 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);