From nobody Sat Dec 31 12:39:31 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 4NkhXM3N3xz2nNZS; Sat, 31 Dec 2022 12:39:31 +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 4NkhXM2d9Cz4NLW; Sat, 31 Dec 2022 12:39:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672490371; 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=mbmUVGmFF4WhtZ9NjVGk18uJz3tXcmMMPX3YerAuZ3o=; b=vEhVOqnmcBGRar4REfUdXqAnDUSEZGp0HzsJ6ja6CpWF1qUIEVJBVKcQG2SabnbhuetmPv phb96RAgZPgDU6+Gpiw9FxcY25Jo6UZQz6zfM4qGMTEq2QPHqk/K71jR8nmqQ+/CduycmF vWAD28KS9X2dltXkQk1QnBqeviWJsRzNTRHzN7uU7e37TmRSM821/lLJpbjRtUQAPwpf/V hQh2VBGfsrBhPsIiuPYgMyTT568LQtuZSiqpfSqt5yFBgZQYlG6r82Iq6/2hJKp6cju3le 0S7gZss4mSU+D2lP6z8bhQGYbNoeFjgLvfsSV4BFOJ3LwoasqN64x6dRzEtnRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672490371; 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=mbmUVGmFF4WhtZ9NjVGk18uJz3tXcmMMPX3YerAuZ3o=; b=gPVASAObI9huj1CuC85EYgwTLavCpbgtIrRhH8UEVHKiRPBHVTim9Uv/r8BdJDP/I3X0Qh cUbXRzCQ3HUepv3BLbBlL0o26YmkhJuxvn6RK72eY6Gylsm8f8yAGcaZunls3xQNpK27EU VK8OZQbWN7n+nlrc2L1L8q9F54yjUgn00b1Aio1WNS3yXQ//vI5qmtFRj6vVM3VDs4jdvV Me7bc0gY/PkFATPJv3lGvLorEM2uGrFQ/Pe2YNAvW2fUNrNKRMvNPd9/55u7zAoNOawiYx hbGt6YsH8/et/St3s+HabUHQSoLvsSBrhg/+32FruJrHDljbR1SmVfSH3DbDJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672490371; a=rsa-sha256; cv=none; b=NnJwbhdVO1PlL4RfPf/0SgMCIDDAKPlNR3X0+ijn7Zas/57/YheCaLeLsQW0hUdpq3ywbW HrjG7qdjiQTzVQJCwQU3HETggCUHP/VfQOY6x5s99b2J9M/IQ1oc0CE7nkHF9uQFpcamQF GyctRRnH92IS8HaV3OvMRKtW4VPJh8tdxA2/3WuhkD6EyLCRVzoYgtHXNqwpjlDwF49GVH 7rH6SPnaMdsEPuvZBVyf0Q/tjlqBPVxbRS56cmsxKioCOGFoxjDGJq1hp0ywdh4ov12cj8 4LPCUKuO4arQ4YUbV79eAqRT/Aq98wE1N3ABlFaWh7H2IWHyNQUAHpiT5E6ekw== 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 4NkhXM1bnJzpZs; Sat, 31 Dec 2022 12:39:31 +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 2BVCdVLq084315; Sat, 31 Dec 2022 12:39:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BVCdVwx084314; Sat, 31 Dec 2022 12:39:31 GMT (envelope-from git) Date: Sat, 31 Dec 2022 12:39:31 GMT Message-Id: <202212311239.2BVCdVwx084314@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vincenzo Maffione Subject: git: f7691b18b76e - stable/12 - netmap: vale: fix disabled logs 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: vmaffione X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: f7691b18b76e2706b126dd97fdf2d546d2cc7285 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by vmaffione: URL: https://cgit.FreeBSD.org/src/commit/?id=f7691b18b76e2706b126dd97fdf2d546d2cc7285 commit f7691b18b76e2706b126dd97fdf2d546d2cc7285 Author: Vincenzo Maffione AuthorDate: 2020-06-03 05:49:19 +0000 Commit: Vincenzo Maffione CommitDate: 2022-12-31 12:33:11 +0000 netmap: vale: fix disabled logs MFC after: 1 week (cherry picked from commit 06f6997eb5fd0d91560b9eec0f842214c21856e8) --- sys/dev/netmap/netmap_vale.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/netmap/netmap_vale.c b/sys/dev/netmap/netmap_vale.c index fc61ba49f6e8..f2a0524b04a2 100644 --- a/sys/dev/netmap/netmap_vale.c +++ b/sys/dev/netmap/netmap_vale.c @@ -1039,7 +1039,7 @@ nm_vale_flush(struct nm_bdg_fwd *ft, u_int n, struct netmap_vp_adapter *na, } nm_prdis(5, "pass 2 dst %d is %x %s", - i, d_i, is_vp ? "virtual" : "nic/host"); + i, d_i, nm_is_bwrap(&dst_na->up) ? "nic/host" : "virtual"); dst_nr = d_i & (NM_BDG_MAXRINGS-1); nrings = dst_na->up.num_rx_rings; if (dst_nr >= nrings) @@ -1119,7 +1119,7 @@ retry: nm_prdis("send [%d] %d(%d) bytes at %s:%d", i, (int)copy_len, (int)dst_len, - NM_IFPNAME(dst_ifp), j); + dst_na->up.name, j); /* round to a multiple of 64 */ copy_len = (copy_len + 63) & ~63;