From owner-dev-commits-src-branches@freebsd.org Thu Aug 19 00:24:35 2021
Return-Path: <owner-dev-commits-src-branches@freebsd.org>
Delivered-To: dev-commits-src-branches@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.nyi.freebsd.org (Postfix) with ESMTP id 760E265907E;
Thu, 19 Aug 2021 00:24:35 +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 4Gqlrg2s4sz3lZZ;
Thu, 19 Aug 2021 00:24:35 +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 498AF1ACF3;
Thu, 19 Aug 2021 00:24:35 +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 17J0OZbx054380;
Thu, 19 Aug 2021 00:24:35 GMT (envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17J0OZoU054379;
Thu, 19 Aug 2021 00:24:35 GMT (envelope-from git)
Date: Thu, 19 Aug 2021 00:24:35 GMT
Message-Id: <202108190024.17J0OZoU054379@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Ed Maste <emaste@FreeBSD.org>
Subject: git: 7429c75a19d2 - stable/12 - ipfilter: remove doubled semicolons
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: emaste
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/12
X-Git-Reftype: branch
X-Git-Commit: 7429c75a19d297f4ab80042662292ac9ec668e99
Auto-Submitted: auto-generated
X-BeenThere: dev-commits-src-branches@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: Commits to the stable branches of the FreeBSD src repository
<dev-commits-src-branches.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-src-branches>,
<mailto:dev-commits-src-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-src-branches/>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Help: <mailto:dev-commits-src-branches-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-src-branches>,
<mailto:dev-commits-src-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Aug 2021 00:24:35 -0000
The branch stable/12 has been updated by emaste:
URL: https://cgit.FreeBSD.org/src/commit/?id=7429c75a19d297f4ab80042662292ac9ec668e99
commit 7429c75a19d297f4ab80042662292ac9ec668e99
Author: Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2021-08-16 17:16:23 +0000
Commit: Ed Maste <emaste@FreeBSD.org>
CommitDate: 2021-08-19 00:24:17 +0000
ipfilter: remove doubled semicolons
Local commit; ipfilter upstream is inactive.
Discussed with: cy
MFC after: 3 days
---
sys/contrib/ipfilter/netinet/ip_frag.c | 2 +-
sys/contrib/ipfilter/netinet/ip_state.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/sys/contrib/ipfilter/netinet/ip_frag.c b/sys/contrib/ipfilter/netinet/ip_frag.c
index 93bcc2ed9415..4a2596e72563 100644
--- a/sys/contrib/ipfilter/netinet/ip_frag.c
+++ b/sys/contrib/ipfilter/netinet/ip_frag.c
@@ -1181,7 +1181,7 @@ ipf_frag_nat_next(softc, token, itp)
ipftoken_t *token;
ipfgeniter_t *itp;
{
- ipf_frag_softc_t *softf = softc->ipf_frag_soft;;
+ ipf_frag_softc_t *softf = softc->ipf_frag_soft;
#ifdef USE_MUTEXES
return ipf_frag_next(softc, token, itp, &softf->ipfr_natlist,
diff --git a/sys/contrib/ipfilter/netinet/ip_state.c b/sys/contrib/ipfilter/netinet/ip_state.c
index 0ebebb49297d..7918f34fe685 100644
--- a/sys/contrib/ipfilter/netinet/ip_state.c
+++ b/sys/contrib/ipfilter/netinet/ip_state.c
@@ -2855,8 +2855,8 @@ ipf_checkicmpmatchingstate(fin)
tcp = (tcphdr_t *)((char *)oip + (IP_HL(oip) << 2));
- hv += tcp->th_dport;;
- hv += tcp->th_sport;;
+ hv += tcp->th_dport;
+ hv += tcp->th_sport;
hv = DOUBLE_HASH(hv);
READ_ENTER(&softc->ipf_state);