Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 31 Dec 2022 12:39:31 GMT
From:      Vincenzo Maffione <vmaffione@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: f7691b18b76e - stable/12 - netmap: vale: fix disabled logs
Message-ID:  <202212311239.2BVCdVwx084314@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/12 has been updated by vmaffione:

URL: https://cgit.FreeBSD.org/src/commit/?id=f7691b18b76e2706b126dd97fdf2d546d2cc7285

commit f7691b18b76e2706b126dd97fdf2d546d2cc7285
Author:     Vincenzo Maffione <vmaffione@FreeBSD.org>
AuthorDate: 2020-06-03 05:49:19 +0000
Commit:     Vincenzo Maffione <vmaffione@FreeBSD.org>
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;
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202212311239.2BVCdVwx084314>