From nobody Tue Oct 13 19:52:04 2026 X-Original-To: dev-commits-src-main@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 4j44jd0g0pz6w5WJ for ; Tue, 13 Oct 2026 19:52:05 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4j44jc6Z6xz4Hb7 for ; Tue, 13 Oct 2026 19:52:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791921124; 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=Eq8JLW2N+NBYtVge4UT3ks4rN+HkTqb+98dph5cJFQU=; b=TguR82X/HeEBfcGLrpFtPOXTG+aP5PpfPTRpfMFMtfnbqXWV2nQ3skinNqh/qnrCIGg5KU ZYxHUjp5aQpxcy6y0tazg/DAM0MhSIzyFqbXeSbCB0ceawk1e2p+5tba+DhGV/Flh97KCj u7xsGkQMUZJ+MYFqHtdRasC3UmuDrwy1vojTyg/ZAn/hXsvkDFHEQEFNhswrZD1ForWbnx QO26k06Gb3MAPmACZvxUR+3LImPVwAcagvdPDbq6Go/MAMfLE0v5VID5AQiDvaHoxvhJdt hT6ZgRRceA9WwqFoNnOnJzbizaN4nejum4I1ac7K2+40lK+NL3O2Q0NMhsQ4xg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791921124; b=qdZXrKDhY2eaZiNHlQW9BHEX/IeTr60N5RI3hlX57ZqohRLGpYUmRG6HGetfZycUHKPL79 pjj1ozuNbqLjKFs4udC4b2Et6QY2/9hcBMkCO3QTF4wKYBRKknwM/4F+D315AJZgmozASa afu5rgnS5ZHWdvBiE5eIQqrrpTZL2Cgj8tOZ5j3rOqdj7nqPcHRXaHe8yL0JZmp+9eTgjJ iVPK/QQMzG8SF/rVfpXiiLSK/2wLnUTO3IOzUsw6wTKka9KkC+MQXWTBnjEaKj9gUlwi/A 06o4vU9R0Q0R2VXlracr0q3BHrvmAL/4Zu6pnHoePribUNvtm8by9GhprGh2XA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791921124; 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=Eq8JLW2N+NBYtVge4UT3ks4rN+HkTqb+98dph5cJFQU=; b=OMv2H5LDrxHy+NiMJVhg1JD81TMK/Ou9Kvj1Ntap9g43dpDiYLaKXhjV1QU0tvO9+c7ua1 I2s69sAt/lNihJK3CChnoqUf9y0LJ/Cmf3yWKilUpU0Kxl//1ItdNveEsQBLh8wJHASOz5 Q8gLQoDrPpCDkmwDdo0DH0VtKXBrXre5rMBimLNTJzRrDcOtkn8PHxEm1NLqPSRI4KKLD7 1H4o2Nsep5KBFO1OxjXLtC8wSTLhaJG8ewj09yqL7v/8oR9grGgOnqDyB5G/p4Sch4SRar Xjgk3GriYNL1erRtK6XpTcaQCYDFvXf1Lo1h+0dmKUaDcpDoQN8OtWo7Ip/vFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4j44jc5dydzT0k for ; Tue, 13 Oct 2026 19:52:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4433b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 13 Oct 2026 19:52:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: a20bbabe3431 - main - ipfw: re-arrange declarations so that they match comments List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: Commit messages for the main branch of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a20bbabe343148c1a6d4b234c05fbcc9916c840d Auto-Submitted: auto-generated Date: Tue, 13 Oct 2026 19:52:04 +0000 Message-Id: <6ace8be4.4433b.78c5b28d@gitrepo.freebsd.org> The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=a20bbabe343148c1a6d4b234c05fbcc9916c840d commit a20bbabe343148c1a6d4b234c05fbcc9916c840d Author: Gleb Smirnoff AuthorDate: 2026-10-13 19:51:53 +0000 Commit: Gleb Smirnoff CommitDate: 2026-10-13 19:51:53 +0000 ipfw: re-arrange declarations so that they match comments No functional change. --- sys/netpfil/ipfw/ip_fw_private.h | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/sys/netpfil/ipfw/ip_fw_private.h b/sys/netpfil/ipfw/ip_fw_private.h index 67bdde66e385..557bb12cca78 100644 --- a/sys/netpfil/ipfw/ip_fw_private.h +++ b/sys/netpfil/ipfw/ip_fw_private.h @@ -161,7 +161,15 @@ void ipfw_nat_destroy(void); struct ip; struct ip_fw; struct ip_fw_chain; +void ipfw_log(struct ip_fw_chain *chain, struct ip_fw *f, u_int hlen, + struct ip_fw_args *args, u_short offset, uint32_t tablearg, struct ip *ip, + void *eh); +VNET_DECLARE(u_int64_t, norule_counter); +#define V_norule_counter VNET(norule_counter) +VNET_DECLARE(int, verbose_limit); +#define V_verbose_limit VNET(verbose_limit) +/* In ip_fw_bpf.c */ void ipfw_bpf_init(int); void ipfw_bpf_uninit(int); void ipfw_tap_alloc(struct ip_fw_chain *, uint32_t); @@ -169,13 +177,6 @@ void ipfw_tap_free(struct ip_fw_chain *, uint32_t); void ipfw_bpf_tap(struct ip_fw_chain *, struct ip_fw_args *, struct ip *, uint32_t); void ipfw_pflog_tap(void *, struct mbuf *); -void ipfw_log(struct ip_fw_chain *chain, struct ip_fw *f, u_int hlen, - struct ip_fw_args *args, u_short offset, uint32_t tablearg, struct ip *ip, - void *eh); -VNET_DECLARE(u_int64_t, norule_counter); -#define V_norule_counter VNET(norule_counter) -VNET_DECLARE(int, verbose_limit); -#define V_verbose_limit VNET(verbose_limit) /* In ip_fw_dynamic.c */ struct sockopt_data;