From nobody Wed Jan 19 14:23:51 2022 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 6D63419720AB; Wed, 19 Jan 2022 14:23:52 +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 4Jf7DR4Gzfz3Pg0; Wed, 19 Jan 2022 14:23:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642602231; 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=x5xTy+y+WtFM7DGcBNEdOGj5ZNdR6uOT5BfuYStMVFI=; b=SHSqRxK20GMQKYGHVy477hMG0hRYXfXr/MN31vvYvZNdPAiA5nvURSCO7fxiDUgI+kaPrG 9t+7eMKr/Y9CV030NvX8u+q0WBWtYs+oZyKNuuULyvnH9Q601ZWAT/X+3mdfvOkBLr00Bt rheefS06kTkKIEU6X6Y3hj2iF9k+T6ACdfMpkuFWHBRXFkcrNtFi4I2yh5tqFVY+5GyPE5 POs0VDu8wbgVo6GK6GY0wYTp9xPZP/tzMl5eeju53viqKdbvpE2+EAKmtbEhpdhYr12fl7 ezNhXHa95s6VYOc3aVf/PVXe4HY0WI6qwLfKWTpZu3DdUNMOGXYrjpKzOkJoMg== 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 50E1916921; Wed, 19 Jan 2022 14:23:51 +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 20JENps5010688; Wed, 19 Jan 2022 14:23:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20JENpYT010687; Wed, 19 Jan 2022 14:23:51 GMT (envelope-from git) Date: Wed, 19 Jan 2022 14:23:51 GMT Message-Id: <202201191423.20JENpYT010687@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 931aa7a879bc - stable/12 - ipfilter: Fixup comment 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 931aa7a879bcb40d4e02c1d4fffef0a25b9319cc Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642602231; 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=x5xTy+y+WtFM7DGcBNEdOGj5ZNdR6uOT5BfuYStMVFI=; b=NmviW395LqR8xj9hNKeex6qVJ8N45e/Dvh1a1779+ydkeyMSInT9RvhC6lr5luTC397QK2 /Qz+MSe3+4aIwDnrRek4aFw4ftLJp3qedyQVeqsLSW8T58IXcsyWdl25q+Wf1GXJw8x0nD +P+2ajRbIc2qoMMOp5rVrQC/78ZXcZJ89e1ItoRbLzph7A3sBqrhPuV0QF5TQZt8HI1CXM ru1NQDM5l98O44DX+KuRB6DR5LUV2MgOlQ0c8FKI55YjCM/48kIEzY5zwPQsJJX6+EF+cg zRev4OaEl5xMls8Kyo9bpVlhdFmzLTqlHnuAqncRP1CC34v4tuKSeWHM5dcZvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642602231; a=rsa-sha256; cv=none; b=id01lJCLt8tr7FVJ/3vUiuI4KTR+WNr+r4jVX1BzIMSIdXDxPG6BzHGMbdv/6zNk+aUNcW 06Rq42Xmu6uLG2+1QcK/acexG8+EO/bFyDppamM1mtfZvrMgidsXT5pUL9B9+gT78SJSmE mpcdJ4a1AtV8yvAmOj5KRlUzEFq6eVCNlfrmxnS1vt0200gWYP3k1msVcyjRwuDCWRTlib thaP86l+KqkvDgs/P5Pi53nZ+JDaFa0yx+vh683bz/dZH6n8sm8/7vBAPUHMppo5SerPF4 4elosJddFmDccB1GD2FQophOJuzt6L0sf7GQecpG9KQmeBCrmxY5aOoyyzm6LQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=931aa7a879bcb40d4e02c1d4fffef0a25b9319cc commit 931aa7a879bcb40d4e02c1d4fffef0a25b9319cc Author: Cy Schubert AuthorDate: 2022-01-12 21:03:46 +0000 Commit: Cy Schubert CommitDate: 2022-01-19 14:23:16 +0000 ipfilter: Fixup comment Fix comment documenting checksum block in ip_nat.c. Fastforward doesn't perform checksum. (cherry picked from commit 896a0153190937e071a31c682c6cf55e4c599886) --- sys/contrib/ipfilter/netinet/ip_nat.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/contrib/ipfilter/netinet/ip_nat.c b/sys/contrib/ipfilter/netinet/ip_nat.c index 76a2dba15402..e990658551b3 100644 --- a/sys/contrib/ipfilter/netinet/ip_nat.c +++ b/sys/contrib/ipfilter/netinet/ip_nat.c @@ -5128,10 +5128,8 @@ ipf_nat_out(fin, nat, natadd, nflags) defined(BRIDGE_IPF) || defined(__FreeBSD__) else { /* - * Strictly speaking, this isn't necessary on BSD - * kernels because they do checksum calculation after - * this code has run BUT if ipfilter is being used - * to do NAT as a bridge, that code doesn't exist. + * We always do this on FreeBSD because this code doesn't + * exist in fastforward. */ switch (nat->nat_dir) {