From nobody Wed Sep 21 11:05:04 2022 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 4MXbD05s1Sz4d4tY; Wed, 21 Sep 2022 11:05:04 +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 4MXbD056Zmz3syh; Wed, 21 Sep 2022 11:05:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663758304; 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=Hz/e8bEFzY6Mw60qBQ7F6HfcbyGBGugKbPL59bFgx10=; b=XgrDModFFrXTrIXtSRUja8WXFDejVwKIhhz9aaq3MPc+ups03l7YyfY1eV32qp5jygqNqC 6XViUVmFE0lLwlTIJc648lJzgXQSGam/ZKNdxH6ccrIrfzfJVWclELoQ3ZUDeUe1iWtpRm LlYMvzrNozIqKDLINjiRn4SqAlhd94tO2x9GBGAh0+R86PesNKB6Ep+4T6NWn/gzWrXBIr /O5xbQEEYgZssMOUoFA2ghJCbqcicXSJ0/o7+0dLmaowcGISBFdadHZ+jfalB2dNRR1It8 j1CHvxqaDlABhSAvxcMNaXVCyIxawYyTLpUqJ4ny4ruFv6nbTbbfvo2S69I/vw== 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 4MXbD044n1z13D9; Wed, 21 Sep 2022 11:05:04 +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 28LB54uc077009; Wed, 21 Sep 2022 11:05:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28LB54FI077008; Wed, 21 Sep 2022 11:05:04 GMT (envelope-from git) Date: Wed, 21 Sep 2022 11:05:04 GMT Message-Id: <202209211105.28LB54FI077008@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 440217b0af5f - main - debugnet: Fix parameter order in the calls to m_get() 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 440217b0af5ffa08086829f5902b01a92e7a6790 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663758304; 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=Hz/e8bEFzY6Mw60qBQ7F6HfcbyGBGugKbPL59bFgx10=; b=D5Puo+XDwtiDS4oaB/yoOoxfk8hIi5UOAO4aaF7U38iG7f3437rtqjZKzDtan8OxUDTCQP RCjXntCr3g7jcPxY40DGNUlVTyRh8Dw31u9WC7T3hHlgKRrrII/RbH1UYH/VBbN3kVfQvA sJepHFR3wpNraQ7DJ2I/aKOpWKxwTsVDxftNRDlohAMqxSjRjVJgUOLKRe2RY8zNlwRtRw fbPTsBOje1K3mLt2URXHcZyDVjsjv/c/yFIy3i0xBGA5SFWRk158CDeOJtdLYnfd0qVwBk C/DCxLPsG7Dl8NkYrtI2OrZLf1dwaP9qe41gmAdQ61brFyp1T7H8lp0AiZVCOg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663758304; a=rsa-sha256; cv=none; b=hlW++/ckLx1rrimOaI6DRLTrl+TNPm0xXNK+EaF6fxPFnA6zbgLqSvaQXpuLk81858tbHG FO8IoorWPFdfi7MoZ/LCRdSV37BXXOntoDR5FZ3xGN05VlClTroRgO7M7iSCCZByo9Cnkt fgRXSvn8MuDmcq/uLFGKB/cnRdo5YRHImbVOimPV3BUsBQGxuixBqT3ToNXO2BqSXBNvIS y7CgkX0JImYVRklXPDL+jyLxDKmcVOpcSyvMilEt0hBfbkNAr6fa2laCK91QoewJBDrwC9 wmVUl9T+59sGH3MGLRqCEd1TNlxYDQP0Mt/NK7ZiwJ00GRnB/+zEg3SmfbZPkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=440217b0af5ffa08086829f5902b01a92e7a6790 commit 440217b0af5ffa08086829f5902b01a92e7a6790 Author: Zhenlei Huang AuthorDate: 2022-09-21 10:55:20 +0000 Commit: Mark Johnston CommitDate: 2022-09-21 10:55:20 +0000 debugnet: Fix parameter order in the calls to m_get() Reviewed by: markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D36643 --- 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 a302545192fe..d47b1fbf3c60 100644 --- a/sys/kern/kern_mbuf.c +++ b/sys/kern/kern_mbuf.c @@ -478,7 +478,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); @@ -621,7 +621,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) {