From nobody Wed Jan 12 21:05:16 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 15FA61946169; Wed, 12 Jan 2022 21:05:17 +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 4JZ0Sr5pSmz4Z9M; Wed, 12 Jan 2022 21:05:16 +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 A7A4D13661; Wed, 12 Jan 2022 21:05:16 +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 20CL5Gqa079971; Wed, 12 Jan 2022 21:05:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20CL5G6T079970; Wed, 12 Jan 2022 21:05:16 GMT (envelope-from git) Date: Wed, 12 Jan 2022 21:05:16 GMT Message-Id: <202201122105.20CL5G6T079970@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: f98cc177f7b8 - main - ipfilter: Remove redundant else if 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: f98cc177f7b8afae670f28adf2b88cc00b990bf7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642021516; 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=kUzRxJ4eQfanuf2Q6G+VUFyuBn30UBg+ZjodgGUtSUk=; b=duwORSLzFqtmPm+D20znRZjmvZwac7n0zHKH9/WWP/gS1djGkRXi1iaSrDHd3pUMP7RDDZ RxQFz3fgxFLpBmsTpOShI/ZNOr0R/+vVqMq+9DSwtVfB1JivQvUV0Yeeq8msItDGlVnjf7 iZL0QAiaLsZ/MTzGmLIKkGTjQGnW6NJ/ZkI7L83qhvuiorLhlUVUrXYJ500JdfgVDKkUKR me9sAxKwHlmLvs1C+rlmLrA40KCbv1+EVWRM7lzuB5wtRhn2wrfDFMlhE4VNL1z/YH8gF8 41arXU4nTkLmbu8WonggdWXLTrl+DUbUFZVutpjygQHm5gnLcH4mLhA4QA12ww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642021516; a=rsa-sha256; cv=none; b=X2hNqyR5Y102H+xehCB3kYokJZZvjVpOddxWVcEp5VnPpK642CnrYWE5N5n0OtVfZFu0+J sXiFZZh1Wo8dZT0YlVrr3kNQbQsgdwN2v7HgbKjktloGUSxiQTNXON1sLsxYWtjMIRn5s4 BZqY8E+Qu5TmSeQl/xuqwCkWxQLhxlSuBy2Odmo2H6Op4GcTxHYQqZgKNAuoZ8CTVzm42N rsb2kXIL6XHCpYiQ25BgE+1dzNQpBqlGpAifqyrWhEnIQj1NzCbhVvobeMpr+IofWvcvV/ w6Ef/4UgM3+8v9qBVDrl3CNlGvH0y8QBSyBIR8Dyqwf/FjniaTNTrJRSA1ozJQ== 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=f98cc177f7b8afae670f28adf2b88cc00b990bf7 commit f98cc177f7b8afae670f28adf2b88cc00b990bf7 Author: Cy Schubert AuthorDate: 2022-01-10 17:45:27 +0000 Commit: Cy Schubert CommitDate: 2022-01-12 20:58:05 +0000 ipfilter: Remove redundant else if Combine two else ifs using an or. MFC after: 3 days --- sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c b/sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c index 986cca30c94d..72e2a42695c4 100644 --- a/sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c +++ b/sys/netpfil/ipfilter/netinet/ip_fil_freebsd.c @@ -1081,10 +1081,8 @@ ipf_checkv4sum(fr_info_t *fin) fin->fin_cksum = FI_CK_L4FULL; return (0); } else if (m->m_pkthdr.csum_flags == CSUM_TCP || - m->m_pkthdr.csum_flags == CSUM_UDP) { - fin->fin_cksum = FI_CK_L4PART; - return (0); - } else if (m->m_pkthdr.csum_flags == CSUM_IP) { + m->m_pkthdr.csum_flags == CSUM_UDP || + m->m_pkthdr.csum_flags == CSUM_IP) { fin->fin_cksum = FI_CK_L4PART; return (0); } else {