From nobody Wed Jan 19 14:23:50 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 4D1DB19720A3; Wed, 19 Jan 2022 14:23:51 +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 4Jf7DQ4zGRz3PYb; Wed, 19 Jan 2022 14:23:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642602230; 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=4EQHJxbkSu7vgVO5QyqWJkPUik0Mzlranmgfv3aQhs8=; b=mt6c2naWeP1jNd5rtdeUdVf7213oRvOQxVZW2hh+PJ9ZP2doFXhKT8IotwV9XtTrJEhGNY AfJb4IlcaukoHwAkXornUS4ayZ3D58IxymZ3whIWDnBiE3rXKGnsevsBAv7o08V1qLmmZ7 vIl2rqbfJuKma5Yk+IYtWAHTSJEUdSK3OQVZ4z/4XuurgxNWnNZzf5cyCFxoWusxcu32u7 ndu+pPJOazAKFuJkBqGCug0vWKpEE1x79SG/L+++/myvjLsGrLg1YhzQoc/nMg8wCWnycB xzJyxF54Y0u9mgNvM1kvs3kd2N1sLsSU8glr6EB3qkG7tq/R4Bn7sgZ9OnrjoA== 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 3C43B16736; Wed, 19 Jan 2022 14:23:50 +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 20JENoft010664; Wed, 19 Jan 2022 14:23:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20JENoqa010663; Wed, 19 Jan 2022 14:23:50 GMT (envelope-from git) Date: Wed, 19 Jan 2022 14:23:50 GMT Message-Id: <202201191423.20JENoqa010663@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: 6d0d29809f48 - stable/12 - ipfilter: Fix whitespace errors 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/12 X-Git-Reftype: branch X-Git-Commit: 6d0d29809f481db14baafcdeaa6ec98bcbfd486d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642602230; 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=4EQHJxbkSu7vgVO5QyqWJkPUik0Mzlranmgfv3aQhs8=; b=sA067r3AT0tRJRxr4zW+Ry2S/mggEogFxDhc+WjIkAyR4LQt91ZA/MyJZqxVyfO+GrzLa0 K3jjJZsZjv8xA/wFuu+zBmOtsMHCmQVgQbmwaHAWT+4c//A8ojTRmAXy0HpKQoccIURChN 4RXxBJnnX62yD+ZR+liJ10otIwBNtyu4ts5jp2zGF4PeuTzI6Yq9WzuRbrRM2Y0nCfYH+k mpzgVWh4bwD/4N+um8ci6+FkGsgp6yb4k1EpxftroNcQIhnQB0n6YjmnYnx87nCgtXrXwj 3miiuBV6SNcMlRiMEjvwALmME8hVNjqF64VUvwTI/WlrF48ZT7eyvlhXiBnSyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642602230; a=rsa-sha256; cv=none; b=ySthmJg9oq25rYiR59z93+U4PmBpfEw3wzg7vfN7Hv86aMhdDqgWtd8D4TZ6Ni/IuwigMP MEoAJzNAySQsJJP90pd8ZrmQJbCGebspkNZhOS19wZXJBWpRXchiiq2QigMOCZwEf3dbkQ QWQgwJvgI1rkOqwvooMw1mPm9i/yGT8mppA2Yhq9N4O+pyy8tCumjDijJ971GdZVUDtzyx 7JfXbEywYQ0cJVMFKNvzbbBXcWgXn5Via3OjJKM/n14d75j3NIxkF/XTgW81FxizWwmtww ckk6At9cbQ74JVrLNozjI+TEBAg4v/3G1LPQCG59LwTVvrmBElghhJIFtUT8nQ== 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=6d0d29809f481db14baafcdeaa6ec98bcbfd486d commit 6d0d29809f481db14baafcdeaa6ec98bcbfd486d Author: Cy Schubert AuthorDate: 2022-01-11 23:10:43 +0000 Commit: Cy Schubert CommitDate: 2022-01-19 14:23:16 +0000 ipfilter: Fix whitespace errors (cherry picked from commit 6af38b34e4b9863171e0240df1d1d432606c21a1) --- sys/contrib/ipfilter/netinet/ip_nat.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/contrib/ipfilter/netinet/ip_nat.c b/sys/contrib/ipfilter/netinet/ip_nat.c index bfb6335b36d9..76a2dba15402 100644 --- a/sys/contrib/ipfilter/netinet/ip_nat.c +++ b/sys/contrib/ipfilter/netinet/ip_nat.c @@ -873,7 +873,7 @@ ipf_nat_hostmapdel(softc, hmp) /* Returns: Nil */ /* Parameters: cksum(I) - ipf_cksum_t, value of fin_cksum */ /* sp(I) - location of 16bit checksum to update */ -/* n((I) - amount to adjust checksum by */ +/* n(I) - amount to adjust checksum by */ /* partial(I) - partial checksum */ /* */ /* Adjusts the 16bit checksum by "n" for packets going out. */ @@ -915,7 +915,7 @@ ipf_fix_outcksum(cksum, sp, n, partial) /* Returns: Nil */ /* Parameters: cksum(I) - ipf_cksum_t, value of fin_cksum */ /* sp(I) - location of 16bit checksum to update */ -/* n((I) - amount to adjust checksum by */ +/* n(I) - amount to adjust checksum by */ /* partial(I) - partial checksum */ /* */ /* Adjusts the 16bit checksum by "n" for packets going in. */ @@ -957,7 +957,7 @@ ipf_fix_incksum(cksum, sp, n, partial) /* Function: ipf_fix_datacksum */ /* Returns: Nil */ /* Parameters: sp(I) - location of 16bit checksum to update */ -/* n((I) - amount to adjust checksum by */ +/* n(I) - amount to adjust checksum by */ /* */ /* Fix_datacksum is used *only* for the adjustments of checksums in the */ /* data section of an IP packet. */ @@ -1434,7 +1434,7 @@ done: /* n(I) - pointer to new NAT rule */ /* np(I) - pointer to where to insert new NAT rule */ /* getlock(I) - flag indicating if lock on is held */ -/* Mutex Locks: ipf_nat_io */ +/* Mutex Locks: ipf_nat_io */ /* */ /* Handle SIOCADNAT. Resolve and calculate details inside the NAT rule */ /* from information passed to the kernel, then add it to the appropriate */