From nobody Mon Jun 17 04:03:27 2024 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 4W2bpS145mz5NCqC; Mon, 17 Jun 2024 04:03:28 +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 4W2bpS0RbNz4ql6; Mon, 17 Jun 2024 04:03:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718597008; 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=RLBvz3mgn41s0B5Y5eZa1c9FUYNzJbQPCNgdf38k25M=; b=ixtIDQrHMY1Q1Dt1INacC9pB9j8NfXieSWhzoLAjcsGgpzOXxvOyAxR+kuKzQV2DqfhX8D ApCKPR63kkxpPR1J12d4EPJzE7MY8ebQ/oGJCzxcWh2rttj501Ihm7hy+cPkEZhMGyDlzx lpq7UQqXaysvx7mKeePaK8f/6nH/ArliQl/qfFrEf423NYlFpq5cEQf7mlVU1LPoQC8YDu E0ESCNW9/8fjFpYzzPeURGtmu2oq31rvAW6Wjvqkz4WbPgH4jDzRYfO+P7h5tvSszYUgNI x5EeCVM8rZfrp+QYJJosM88+lkKSo1DaM0o/W74KwXO+PIQDbZjlAZUJ2NDIew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718597008; a=rsa-sha256; cv=none; b=nw7oZ26Q/guy5OJuhvq8SusNTC4dWF+wqjCkind9TC/YNCHxKgkpPRSzNvf6gRIbofR8Kz UMOtegrRXCICNoSeNUHiJ0IgyfcRfoDCNl5XRwfkGh06/UKUyIJNfccdVbCxjHRgykc+uE KUQ96eihG4QVsC6KI/IaQrHw0x0Nk7Ya+qgmyg+2TETbo2sW9RZrJn7ZlKes4dXGitn0xx mOfe69ErROmAnHeuoS9NcF3PwbZqpF2fleFGGXsVPQb6c4YxYuHS22HPhMVWD83RTGSgZZ hiGlAAit+2QfX3TObHRcE8wbIyucx+V9dK55cOadeSEVXmf89LZZrOiL0r/xeg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718597008; 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=RLBvz3mgn41s0B5Y5eZa1c9FUYNzJbQPCNgdf38k25M=; b=p+DfTtYeJdc348FFdFNwFznuzWfPD9EcaLj8Im4fboiNCzPC5z1gNBC16dMnTVisX+tenb 2BLYja/mCBxyuMDNTpQL8lY2bFsJgTTgOL4Nf19yaWIyRGKdrA/rIlFY2SrIKhrQGl3RqV +kkw0Gd2j7ZpJmWK3/BOFosiWs6J3rEKdpn9ezTBR/513r4xZWwqKSLAlkPlJBrKQCSdjB T2A3gb6iGRnWk0Yz1M+8J5iGDVPyG0F/J/flDfEtToer5juvIVRBjJNjZjzTtSQwWmHYXe 57ENnuxCpsaRj5Z2ERTxqL2J+hQTOflTPw8rswJhmgsGhAv2GZrbpKwETflgKw== 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 4W2bpR6VBwz1Fxl; Mon, 17 Jun 2024 04:03:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45H43RhU039610; Mon, 17 Jun 2024 04:03:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45H43RhZ039607; Mon, 17 Jun 2024 04:03:27 GMT (envelope-from git) Date: Mon, 17 Jun 2024 04:03:27 GMT Message-Id: <202406170403.45H43RhZ039607@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: a674f992a135 - stable/14 - if_enc(4): Prefer the boolean form when calling bpf_peers_present() 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a674f992a135728648908874034408d43b3d1903 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=a674f992a135728648908874034408d43b3d1903 commit a674f992a135728648908874034408d43b3d1903 Author: Zhenlei Huang AuthorDate: 2024-06-06 04:20:26 +0000 Commit: Zhenlei Huang CommitDate: 2024-06-17 03:59:18 +0000 if_enc(4): Prefer the boolean form when calling bpf_peers_present() No functional change intended. MFC after: 1 week (cherry picked from commit 215a18d502cba2cf57251e82a84484219f2c432a) --- sys/net/if_enc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net/if_enc.c b/sys/net/if_enc.c index 971afdabfff6..eaac0a843189 100644 --- a/sys/net/if_enc.c +++ b/sys/net/if_enc.c @@ -217,7 +217,7 @@ enc_bpftap(struct ifnet *ifp, struct mbuf *m, const struct secasvar *sav, else if (hhook_type == HHOOK_TYPE_IPSEC_OUT && (enc & V_bpf_mask_out) == 0) return; - if (bpf_peers_present(ifp->if_bpf) == 0) + if (!bpf_peers_present(ifp->if_bpf)) return; hdr.af = af; hdr.spi = sav->spi;