From nobody Mon Feb 21 09:18:46 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 D3EE019D64FB; Mon, 21 Feb 2022 09:18:46 +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 4K2GvB5ctvz4TSL; Mon, 21 Feb 2022 09:18:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645435126; 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=t1nPO8o95fk/cDSLOgYX+kvYiaGjuOrwIrTEgh/hfSI=; b=sYwYK5vHdPGg79tK4XH0KGIUSN6v/imitmUagR3eCXYTddn9P4saeduoEi665WfAwccn8x XRfgrQP4PpedqIm2Gce0sUp59tz/87ylKgDXRom5T+gS6av4pF81x16FW5yAR0+OA1mUcG YvAVtGFC+Zhu5Fp2sz7US61dlByht4rPPn4ote4LOdl0CB0uOkQ7L6vSVjwDs2V67jvAyi UAZOkteLfyWD/mK40o4vgc05qVdhfUzQr8GAr+QmH2D5cVtdpGNdSiVrZS6NlHx924z1or SlurbxZI4iFjhixLpLUNJXuLAjhzomKRue9d2tMNX9VhjJJaD4xp3wx/MFNY9g== 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 A0C8957AE; Mon, 21 Feb 2022 09:18:46 +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 21L9IkYi030665; Mon, 21 Feb 2022 09:18:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21L9IkLm030664; Mon, 21 Feb 2022 09:18:46 GMT (envelope-from git) Date: Mon, 21 Feb 2022 09:18:46 GMT Message-Id: <202202210918.21L9IkLm030664@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 1c8d9e1b05b0 - stable/13 - pf: fix set_prio after nv conversion 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1c8d9e1b05b02b4087f0ca4ccb3a1c9db0af7cd7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645435126; 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=t1nPO8o95fk/cDSLOgYX+kvYiaGjuOrwIrTEgh/hfSI=; b=dXFGdOBGp468tqt6/ogUHmN647bIgXywvkXdKiZ6bB39dO04B2PcM+YCXEFD/tVSwyWH16 8cWhOQM0JNPE4tmso5XUKBoQ3XXX/ctH1Sqg55FgGlZ82mNZjoGhzl3SD1mHg4v4nkh5+6 Ni4U87EstzyAKgpFRLLeySS3lN8WoJFwcdqUTSQoMsJh2vZ0xap+AotEKt2UKCkn7lk0O8 +CvOgG35YjSybUqL9zbHBWQsphpl/jr3spSLTSljbUrJuwx25f6+XW7viLax/iR61x1wte tCChRNEcWyAI22Mo6cTMKvqIRHX5Q36o6O6NvolHVVVs6B3k1zHktUs1dghIrQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645435126; a=rsa-sha256; cv=none; b=dhIKIMtGEmf6Ceeta0rgduFINW3KebRchfy3n1XYJBwj4l6gKYeS/Be93KpCebkDv/0ILk UXEhncuU9TcrnUAkekkm4heYeFQuxFpLXamHWnut5Of6YeMnvoquuKCSB0CIUEj7yBgZk6 yRSkbyI2TQdVj68yTEWH3yg3tvq4gjAp9QloOTUGQqgNOnfsF1nxaETFKn4xbWT6LhKLFf OMP5r7A7uN9Slwlr48of8dCGrVHZDuItOGkqAlpDe1BoBWF+mwg6fip5KXyN7MY908bKTU wjVJntE3x3e07rNWN/q5bP2zFoob+Tba6MKKmSBROk1adLXfG7IXhFwcvBbNuA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=1c8d9e1b05b02b4087f0ca4ccb3a1c9db0af7cd7 commit 1c8d9e1b05b02b4087f0ca4ccb3a1c9db0af7cd7 Author: Franco Fichtner AuthorDate: 2022-02-14 19:26:39 +0000 Commit: Kristof Provost CommitDate: 2022-02-21 09:18:24 +0000 pf: fix set_prio after nv conversion Reviewed by: kp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D34266 (cherry picked from commit 0143a6bb7f634c5984b34db1834313bdb47e6ccd) --- sys/netpfil/pf/pf_nv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netpfil/pf/pf_nv.c b/sys/netpfil/pf/pf_nv.c index 7bfcea7a47c4..e2af55af86e5 100644 --- a/sys/netpfil/pf/pf_nv.c +++ b/sys/netpfil/pf/pf_nv.c @@ -623,7 +623,7 @@ pf_nvrule_to_krule(const nvlist_t *nvl, struct pf_krule *rule) PFNV_CHK(pf_nvuint8(nvl, "flush", &rule->flush)); PFNV_CHK(pf_nvuint8(nvl, "prio", &rule->prio)); - PFNV_CHK(pf_nvuint8_array(nvl, "set_prio", &rule->prio, 2, NULL)); + PFNV_CHK(pf_nvuint8_array(nvl, "set_prio", rule->set_prio, 2, NULL)); if (nvlist_exists_nvlist(nvl, "divert")) { const nvlist_t *nvldivert = nvlist_get_nvlist(nvl, "divert"); @@ -803,7 +803,7 @@ pf_krule_to_nvrule(struct pf_krule *rule) nvlist_add_number(nvl, "flush", rule->flush); nvlist_add_number(nvl, "prio", rule->prio); - pf_uint8_array_nv(nvl, "set_prio", &rule->prio, 2); + pf_uint8_array_nv(nvl, "set_prio", rule->set_prio, 2); tmp = pf_divert_to_nvdivert(rule); if (tmp == NULL)