Date: Mon, 21 Feb 2022 09:18:46 GMT From: Kristof Provost <kp@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: c0a3b19a825b - stable/12 - pf: fix set_prio after nv conversion Message-ID: <202202210918.21L9IkWN030726@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/12 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=c0a3b19a825bc3a5b2004aa03b5f70ed1cd54543 commit c0a3b19a825bc3a5b2004aa03b5f70ed1cd54543 Author: Franco Fichtner <franco@opnsense.org> AuthorDate: 2022-02-14 19:26:39 +0000 Commit: Kristof Provost <kp@FreeBSD.org> CommitDate: 2022-02-21 09:18:26 +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 573544972952..3fda6831754d 100644 --- a/sys/netpfil/pf/pf_nv.c +++ b/sys/netpfil/pf/pf_nv.c @@ -625,7 +625,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"); @@ -805,7 +805,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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202202210918.21L9IkWN030726>