From nobody Wed Jan 12 21:05:22 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 72BD61946525; Wed, 12 Jan 2022 21:05:23 +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 4JZ0Sy6Ygcz4ZNt; Wed, 12 Jan 2022 21:05:22 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 5356C13662; Wed, 12 Jan 2022 21:05:22 +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 20CL5MPe080100; Wed, 12 Jan 2022 21:05:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20CL5MlX080099; Wed, 12 Jan 2022 21:05:22 GMT (envelope-from git) Date: Wed, 12 Jan 2022 21:05:22 GMT Message-Id: <202201122105.20CL5MlX080099@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 896a01531909 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 896a0153190937e071a31c682c6cf55e4c599886 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642021523; 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=T60lc+wXrHDqP4/s3pKpbz0GqITDngkN1+MhReCE74w=; b=rkgKXYIQzZZOtXzB71bT7+fvY8DeothZYK+EdR81AF6qmTN6dQ+ypmI3aXTCJUP6CAAchr jjIpR00/x1TihVpoLlVv0txQTLpYWBAyCj/2vc1KuQeeGQUAxl09K9O1OJDxLLHNqjAdDF yidhMROQqvPduOs1fJbeMEp8CCQqXcWr3I07XFXWNvkOSSVc7m1zvRxf0AwvQjqFRyuAtN mmRUn1GToPCrfxU7AOFLmRFf1mrw6arseJUkn2ARSvI32ADFAC+S4RLxZM0etj55N+LmjO hOyStWSLx82rbUKxItFmDihawnmSirWKLryd5209izLNhBkxONLgCWO7c3aMwA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642021523; a=rsa-sha256; cv=none; b=IIuWBnctp6na5isXo3y2kv9TnqP6UQcvBuGnTXzp57YFAB7TMEGrFo4RZWyMLPZiEyXtOc ugORekAkTBDDDRZi13cPoewBxbp+7yvkHvSzXFmysPCBYQn+12Cnbkr5Si0+5dtamyGkhv Xcuj+X1EBkx8cE8dsma9lJ5JOUHYVIYW3ZIl9caNoemKTl/PcNP644Mfl02bRd3fcLc+D1 tZZbX9uHNBcN5ykc/GjC2Bjp4PF26kGrK/I7HhuPDLJzWGbHjbxOc4NkqfbozPnDJ7duDP h6WEVimzfsJJMGQDzlwIbCtYxVO2PMSriiCP0D0UWhDECzulwCvxrtw/iYXnDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=896a0153190937e071a31c682c6cf55e4c599886 commit 896a0153190937e071a31c682c6cf55e4c599886 Author: Cy Schubert AuthorDate: 2022-01-12 21:03:46 +0000 Commit: Cy Schubert CommitDate: 2022-01-12 21:03:46 +0000 ipfilter: Fixup comment Fix comment documenting checksum block in ip_nat.c. Fastforward doesn't perform checksum. MFC after: 1 week --- sys/netpfil/ipfilter/netinet/ip_nat.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/netpfil/ipfilter/netinet/ip_nat.c b/sys/netpfil/ipfilter/netinet/ip_nat.c index 1c63960e5139..8e9d555395ff 100644 --- a/sys/netpfil/ipfilter/netinet/ip_nat.c +++ b/sys/netpfil/ipfilter/netinet/ip_nat.c @@ -5021,10 +5021,8 @@ ipf_nat_out(fr_info_t *fin, nat_t *nat, int natadd, u_32_t 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) {