From nobody Thu Nov 09 14:39:22 2023 X-Original-To: dev-commits-src-branches@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 4SR4NB6L4Qz4yvyN; Thu, 9 Nov 2023 14:39:22 +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 4SR4NB4J5wz3Q0d; Thu, 9 Nov 2023 14:39:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699540762; 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=UZgyfEktxtpfNrVNYKDMwz6GloX/dAGlEBRzi/VsQjY=; b=EB955uUtEnkyKW0CxZISLMtwpbpPNGV6W3iZDBif5YOfYiDeJ5Me2ZAoRArM+yIK62u3od AMb7DDNiGUXeALer7Tf4H6+cylbzZxN5S9GCt9ionSTQUfa1uqBbYpNFVWllGvWyi/xSm7 8gd/tD496lt+2HblpD0ts9YHztnbTkD55kyMJbOumwycCh1k8Y64ZzpdsJjts7WTNRJW4A pc84+c5otE4U7IQy5WMEII/cCf/lC1D8v/oCX1NjhTwpmaxBuhUI/hsPRKc/eT/CakSi2A gO/kLUMPOjGu9sBSPzWLR6EwaIbawJldNGYr9ZW1wYiopEgyPIp7wikUO24xJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699540762; 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=UZgyfEktxtpfNrVNYKDMwz6GloX/dAGlEBRzi/VsQjY=; b=EWzZS1Qu3jU3R8Z5V+2w0i6+DF1F7T7nK8N0q2sAwkEho7qKY/CFQAyfZyHLfOc+3nqbK1 dYUWUWV6aBtXXReD9xbPFRr7ssAZ5x2shx5TM7HvlApfkHYak+YEZrSGbykElqwGME8aXg ngIsZjBPAmg+tlrtx77J7IqSNT9NZXNQfqp509b7/dqnaoBlrHETplduTCrCm0B6haycMl dUF/z7t+qYpEBUwbXULCREwJhhwZ23BJLwzlOAdD2z8ruEB1wtI2zdX1JtWQicGOOyzQSO HCe+Vs+ge+I9NR2SCLDsWiICwO2kd423E33l+GSxG5sOupo+nUTwj1Wdtg4azQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699540762; a=rsa-sha256; cv=none; b=pQ9HXsodx/JUInXO0KdtrermqBHxDY7fa9sU9GDIg9NnEmTvjDuajwd/OzgePZFnyrHtrJ aMwmYY3IDEFa+XwZxwq8CXxcOfg8RxqK/Z1NRkfuiET7c2JzLLoO/yhAX37zTzTkTm5KRX pDAkEC333ybyVCflXhpbkmRSAfDKIbbXG2Ri3hokca2twvVbZ0npSOjyTlrGfdZ0CIFFUl mg1QU9XSdRTa6eBkuXqH7KlzucvQWs3xoS9HQ6In1OVusldN6Ba/FyHmQ7EBK2W2/fBrKk XuA3SWb9vieI2XyLMo+JQfGdWD8IHhJ9Th7ZeNSJyulu41VxidhqAYVN2uJi5g== 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 4SR4NB3NkPz4cL; Thu, 9 Nov 2023 14:39:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A9EdMXk064524; Thu, 9 Nov 2023 14:39:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A9EdMe3064521; Thu, 9 Nov 2023 14:39:22 GMT (envelope-from git) Date: Thu, 9 Nov 2023 14:39:22 GMT Message-Id: <202311091439.3A9EdMe3064521@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 46a96d68f63f - stable/14 - ip_var.h: align comment style List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 46a96d68f63fc7ba53642df43fc48c88d08e56ee Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=46a96d68f63fc7ba53642df43fc48c88d08e56ee commit 46a96d68f63fc7ba53642df43fc48c88d08e56ee Author: Igor Ostapenko AuthorDate: 2023-11-01 12:21:16 +0000 Commit: Kristof Provost CommitDate: 2023-11-09 09:56:26 +0000 ip_var.h: align comment style MFC after: 2 weeks Reviewed by: kp Pull Request: https://github.com/freebsd/freebsd-src/pull/883 (cherry picked from commit b68d2789f0d745d420203ca7dae9408f81cc7206) --- sys/netinet/ip_var.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h index a8a9adc1d4c6..3220679d749f 100644 --- a/sys/netinet/ip_var.h +++ b/sys/netinet/ip_var.h @@ -333,11 +333,10 @@ __enum_uint8_decl(pf_mtag_dir) { PF_DIVERT_MTAG_DIR_OUT = 2 }; struct pf_divert_mtag { - __enum_uint8(pf_mtag_dir) idir; // initial pkt direction + __enum_uint8(pf_mtag_dir) idir; /* initial pkt direction */ union { - __enum_uint8(pf_mtag_dir) ndir; // a) divert(4) port upon initial diversion - // b) new direction upon pkt re-enter - uint16_t port; /* Initial divert(4) port */ + __enum_uint8(pf_mtag_dir) ndir; /* new dir after re-enter */ + uint16_t port; /* initial divert(4) port */ }; }; #define MTAG_PF_DIVERT 1262273569