From nobody Wed Sep 28 11:53:07 2022 X-Original-To: dev-commits-src-branches@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 4McvyC3DVnz4V1sJ; Wed, 28 Sep 2022 11:53:07 +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 4McvyC2CY7z3RQB; Wed, 28 Sep 2022 11:53:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664365987; 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=lhkatxVJH7WP7hA1rzZDdGmwW6JMfUayk+IfV1Me6lE=; b=lmZ2mLtLPRT9FsyG0rQs851NweAH8AfnlE6wC/DJaEEDHQdqY4Y3FrgYHa8B4Hcn5NEqcs oJSVgxUOxFQza22vPTIwc4K/UH5wndIDgc9Lw+r+KI28JQD8YC4NSf2qN2OUOvXZQI0/BX PODMo6m7UA41mU3Otfg+gx3iFvNDvTID6Ozx7Ia1i6v2EeDETdk1fMEjAzUYUndcvrcYCI 8tg3iC7lX8uC6/NCuR5tRzg/AvXTruXQ7vFF9L9o3dwU14w2XZ+qcgdLt882QudiDM8vR/ 0zM6+xN8sgjsfSxU6IhiqtaZlHYNIQK/hl+dn8BySTfrRCjw9fRjNS1tzgmY9A== 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 4McvyC1FVzzSNH; Wed, 28 Sep 2022 11:53:07 +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 28SBr7ot052057; Wed, 28 Sep 2022 11:53:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28SBr7x8052056; Wed, 28 Sep 2022 11:53:07 GMT (envelope-from git) Date: Wed, 28 Sep 2022 11:53:07 GMT Message-Id: <202209281153.28SBr7x8052056@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 6315a1aac7ac - stable/13 - debugnet: Fix parameter order in the calls to m_get() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6315a1aac7ac7120b9aba5a3239a00ed05be4d1f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664365987; 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=lhkatxVJH7WP7hA1rzZDdGmwW6JMfUayk+IfV1Me6lE=; b=HaDVZZ/3b4QC8zvHdcVVr0eDH6WVOS95isD8qtkCa+YSOXr+FQ6oM+mKjutHTTSaXWZLUX oR9+mhVzV0z+B9fERxrGMERfiKn0aKKGu7LObOpODgy2bitWAvdiM4Qy1rC9lP0OXxfLEU PxlYHmOm1dRnONJYEzrtx35yHveP62vAofo+GTpd2mxXVFjkSsUmkdFtAr8Znb3xav3Ddo I8lTrAcUDgcyxOiHWO8qy9PTfxBRVMoBC8N1+/8VX5m7Egrx2+pVNwHTQkcXzSRwDIePon HcDJgiBX0Ue1yvkAvVpJgjARhVogSQVbCd3VB3yNrAT5JEwdYA6IrUBjqiz/sw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664365987; a=rsa-sha256; cv=none; b=DoW/jZ4sedNVJfGyN1UvE1D46to3/uFpLrUj5UWCLAJU1fNOWMNHh4WfVtUzzN1E9Tn5t3 3Sb1/5knkPuUWPIZev21z8EUq+EuUdQxRao5ZgjZnEuVJeDWsdPqc9KUKPaEDZ240Q1JHX hpvEMB07NuG3TsAbCYux3da9tzwSCfZenmKp8/+eZY7B4kK3quejVnpPi+wiNVXkvifU1J 7rVW5NbMnuqSymTtTEFtctdgb0zRaFfsG6Y2BEvFT2vMWcTW0CsSE2KiGm31sRpGg6I1zj JCo+tU3AMbI5EBxVs2wB0EOjyKRDmAx5x3nSB2seK3PQyGbqdXbCHBFmhCcpeg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6315a1aac7ac7120b9aba5a3239a00ed05be4d1f commit 6315a1aac7ac7120b9aba5a3239a00ed05be4d1f Author: Zhenlei Huang AuthorDate: 2022-09-21 10:55:20 +0000 Commit: Mark Johnston CommitDate: 2022-09-28 11:52:52 +0000 debugnet: Fix parameter order in the calls to m_get() Reviewed by: markj (cherry picked from commit 440217b0af5ffa08086829f5902b01a92e7a6790) --- sys/kern/kern_mbuf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_mbuf.c b/sys/kern/kern_mbuf.c index e0c98d459a28..a1a0157b88c0 100644 --- a/sys/kern/kern_mbuf.c +++ b/sys/kern/kern_mbuf.c @@ -485,7 +485,7 @@ dn_pack_import(void *arg __unused, void **store, int count, int domain __unused, int i; for (i = 0; i < count; i++) { - m = m_get(MT_DATA, M_NOWAIT); + m = m_get(M_NOWAIT, MT_DATA); if (m == NULL) break; clust = uma_zalloc(dn_zone_clust, M_NOWAIT); @@ -628,7 +628,7 @@ debugnet_mbuf_reinit(int nmbuf, int nclust, int clsize) NULL, UMA_ZONE_NOBUCKET); while (nmbuf-- > 0) { - m = m_get(MT_DATA, M_WAITOK); + m = m_get(M_WAITOK, MT_DATA); uma_zfree(dn_zone_mbuf, m); } while (nclust-- > 0) {