From nobody Wed Jan 19 14:21:29 2022 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 9C464196FC96; Wed, 19 Jan 2022 14:21:31 +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 4Jf79k5T8gz3MGP; Wed, 19 Jan 2022 14:21:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642602090; 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=VtNhxVursjRxWiN2UVx5Ea7XgMfBic7X1XQg+YMDxaM=; b=tZatqhhv/jOfHZodf13U2YhlWahJdZkC9q9YvzyxG5X8+BQ3bbzoF8QZpyJ4anZjCigUQt ab14vlwMcQtcs5V35CWbCcVIGRTN5fVTO8dzbD5P4cw5Lan8gtDPsx+FnAmEQmztPyOLpZ H5NsFddIyoztKgWlLVYeMu/qmsuRoNHmVXtVxLWbcKik/+Nc8ypA8Ko5qbpUnjavt3DsBv PQuD3uoz9tRnbdGkYILVyCzXEoG8u4SDC5TRVeLy8dZOD80w4LJksQxw6ll2JVIwTbqB1e 2h/ZxBVuBpSvhWvK8twSEUNjEpGAP+ZZW79xjEQwBw1nZ+W7XoCb+WbbbWSMOg== 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 12187167B7; Wed, 19 Jan 2022 14:21:30 +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 20JELTS5007206; Wed, 19 Jan 2022 14:21:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20JELTx8007205; Wed, 19 Jan 2022 14:21:29 GMT (envelope-from git) Date: Wed, 19 Jan 2022 14:21:29 GMT Message-Id: <202201191421.20JELTx8007205@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: d600d25179f2 - stable/13 - ipfilter: Fixup comment 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d600d25179f23479c66ddfc3962b65c92f07dc2a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642602090; 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=VtNhxVursjRxWiN2UVx5Ea7XgMfBic7X1XQg+YMDxaM=; b=oVt3h2sYYaPxcgXE8j7GoqJ7HRkSHoFV4Yq4Be7kr/QpAzjv5ETPkAMAZqBl1k0FWNjEsS W8WlCYIvwkgZRcZqxrMM/4tI4jKstShU4yF6C0v6B64XU5zqUfTXa1GJR/9xAh1oi8S72m WyosvP8SMOdSD87YXxR+7zgb0WlAX1x2Q0ytx2CseBnX24oEG4ngY/kzCbl2OMZ6QhF7XL XP588dY7ZQSdwob+iH7CpjtxmBn4euoBGvQJWiBLJlnI74G6DZkngrn7BR9kKLCQJ9B7ew ySJH8PT4lxa3cJnnKQu5wDXY+Iry2yE5R6bOIRC4GZ7AMsCJcH2Y9LhFIoP0qA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642602091; a=rsa-sha256; cv=none; b=MwRqy/tAJSIYAeSuDPPDIdjtE6Etu+wOrxmV9Ar65GiFe9rDHqMZWiCj0v66ydoMUQEjh3 k9lIKw5sRJ3qGHe2+LIjZeCAx6Bu3XlaRRBYRbH71dCm1GKvdt4DwaupbtswtZkLt7r80g VXf4rvBI4px5UkjPcdMZHOTsryI60mKFwOgR96H7R/NcdFv6Kgxl79zGe/dGOjHG9MW3bz nJMZPMmGfEV1jp8j0E/xWKtkTu3O6ep6xwrlJG+BNXY5kJ12RoAG3W53xpPJQXVtJgmeuU KlVbpfBZplt38qnw7Ry/yAv9Uus09knZpq97k8ayIf3d4ryjfyE8wowxs6cCEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=d600d25179f23479c66ddfc3962b65c92f07dc2a commit d600d25179f23479c66ddfc3962b65c92f07dc2a Author: Cy Schubert AuthorDate: 2022-01-12 21:03:46 +0000 Commit: Cy Schubert CommitDate: 2022-01-19 14:19:24 +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 cab4700be4a7..09430c1fdfe5 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) {