From nobody Wed Dec 04 13:22:35 2024 X-Original-To: dev-commits-src-main@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 4Y3J9762dQz5fZ2G; Wed, 04 Dec 2024 13:22: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y3J975DqQz4JjD; Wed, 4 Dec 2024 13:22:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733318555; 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=3hw1fyKKP4tWorBQnWCMjsJ/wJpWSMyQKRgSfTeYMFU=; b=xiWL4rh+d8ctSJw/mG0X34BnAKl/7Y+AanZ9cwMd5bTGtfBuPrRen5YDRkEOH/RYGTRz2K /+iPoM1vWFfZbDP+fbklpikWm1sCRN61I1dp4fTAmD6LTEK8+aJJCKIPGIfe9zf56CoyFh w08UloRt1NvQFOfefybyofSZ2rgaIdbT9lAwUBNLU8+O1pSX9nRhbd9jilrqk9xS6zoS3I NymP3mwf0NfCEVIcTc6cDaIm3Vy5p6eVEt175Yv1Z8zWBjqQEUCXzS0Js/JeecsYZdgkRz CWFqsZl+lQgVtTEt0SqK9ExUk0eHIQ7t41Ln2jFyoz5rMezlajtjFVXcQI9VFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733318555; 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=3hw1fyKKP4tWorBQnWCMjsJ/wJpWSMyQKRgSfTeYMFU=; b=YlgvEKyiNbCkk0haK4BkuW85J96uFMHh8qwY8Isq4BIR3/AUryRqi4SlT3u5AKF2e2vGtH 37/bwhOgceBiQBt69WFMvSz5NCVhSGDp2AT1zNHlvoRfEBNz7LdRqRn00UwuEuik2Gdkdh opF2L407x5GM7bi9BX7ViStAfxVo9xuwxlCOeWDgKej/nVx1iq3ho4SIlKAx5SLaxEQYkz pm1jyT7oZPpXmAoqcC+W1xgaphIuK2ifoJtApNentO9374NFTERqsLzIT87a3k0j60kq7F MnsFvcKt3RHaDziPVdO/CvCDbiTZJdwCl3FZTaTNYiyPQCIH5JxL/ARXCevEIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733318555; a=rsa-sha256; cv=none; b=cBfUoWntN4pJrYWIbuBu3lqu/TK4Eu70UciNvcvZWt21ueOqVQhK9GruPLgZ8gXdEtAfEI Rf8g07CvVJd3WybT6gW3j/Pup0+Yi3tvYfvsITYopy/zdNE4s8u85BtCg8g5DxbiXkRLsv b6WSpFpvjBUiP3TuH0r4TVAWc8kMYIEkTX9zgVITo4+v4K+arT+qPF/CPXAG3Ol1MS6f7g JcSaATdSpXsTYCVJ1EpKLehcyZTGLJ/0m1ebM1kr/jr6L4ItCrCxhvzJA9cRi3Xjr/tBAe AJBmZHgtonY5zS/+YHCVQbHXX2ZD/4dS8V/aXh9wx/Tr1vgJl52USa6w3KuP0Q== 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 4Y3J974kVlz18Tr; Wed, 4 Dec 2024 13:22:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B4DMZJX098312; Wed, 4 Dec 2024 13:22:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B4DMZFI098309; Wed, 4 Dec 2024 13:22:35 GMT (envelope-from git) Date: Wed, 4 Dec 2024 13:22:35 GMT Message-Id: <202412041322.4B4DMZFI098309@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: f966ef3a6770 - main - pf: fold if (s != NULL) and if (s) into one block List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f966ef3a677014bacec024ef3f75e185ff60c93a Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=f966ef3a677014bacec024ef3f75e185ff60c93a commit f966ef3a677014bacec024ef3f75e185ff60c93a Author: Kristof Provost AuthorDate: 2024-12-04 09:37:27 +0000 Commit: Kristof Provost CommitDate: 2024-12-04 13:22:21 +0000 pf: fold if (s != NULL) and if (s) into one block Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index f587fa3fb196..8d9d595dc1ec 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -8033,10 +8033,9 @@ pf_route6(struct mbuf **m, struct pf_krule *r, struct ifnet *oifp, s->kif = kif; s->orig_kif = oifp->if_pf_kif; } - } - if (s) PF_STATE_UNLOCK(s); + } if (ifp == NULL) { SDT_PROBE1(pf, ip6, route_to, drop, __LINE__);