From nobody Mon Jan 23 22:11:43 2023 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 4P147z6BHBz2t0Xm; Mon, 23 Jan 2023 22:11:43 +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 4P147z53t1z3KHW; Mon, 23 Jan 2023 22:11:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674511903; 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=4k2uOBoodNImkQK2UkEAM/Sz1884bKlTj5ztRDj7qWw=; b=ZsK/bqh3Nf8e1CHa+UGzUkSQaNeAWiXPNT/YPUeN19i09wD/iXz9A3+LmxYgwAnYjHkPex c44sfC6NVyo+D9RrKiI+QgWprBieQHN3wi4Hkl5/AoNXlpkPOGH7KlWg3LxraPKwLtxgfU qRLJddP8zBCUoxgrANQdD9ugMieAym6U+pjYpM6pZ85ojZesnUYyAE8ZBwqGufVhC7I8YD I7yQUa7PA3kAMbv6mTheIBpYFACZmqLyHVUn0p5wsLJQSVgjVasFB4BtFt31oKtnNF0oo2 f1EAULNlNHA70pnzceeByGTnDqNTwQZx+8sxF27o8A3wQ+gesMYiovpG8FtKSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674511903; 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=4k2uOBoodNImkQK2UkEAM/Sz1884bKlTj5ztRDj7qWw=; b=BRo/BMqFn4Nf50/fA8oJ3lwHnh7mjXs0qeSyy8/LGIOBb1cvN3hBeBatAwoj4YAxHJevSu 5+yUuxnrLd5MUwLc0jdpmd8ajHu+xyn1pCBiT1P0Ef3ic6guJXQGfMG03WirrdRsqrNNDa X34mBuS40DhB4lKi+uXqyOwzLigahZI4LFqXAT3QpUz/4idTP5d8Hr48jiN3FRMw5/pil5 KUij2PzcZaRV6OEF+xasXqQEbHG695Jc/+c3ELMtCxzN1NffDncpAPmI4dc4j0zViFiIbf JTtM4KK1G28hzd2dwX2iu8FmdRdii2og0PaOqDOqGqHyO+/lfFlUMStg2JCW8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674511903; a=rsa-sha256; cv=none; b=viXogNcijcv/Sz81XhkkGPfylG1qe64b+sY/3+D9X97ZwaNOLwc22Mg7bw0GoGlzrqPLv/ 9jb0G9XzZexVpJmcM0qaI4Yc9onO4NywMJHJMCwKHXcKupGH2hAK9XJr3PaEk9bTHFeLKg j9rAWBLJhp+wulVZS8ewpXgz/Szi0b/HxUSCtZ+9xgoi0ECv/J40derSoDfAi3cbDfSf+w +1vCKSQODSVf4QSZxCVIutLNnV+WwO2E6OLMCvJHAwnoM7zBedTha8xrLIiQxBJeTrFOLo BCN5etvJw/7zdwKLAjfbRgAVAtCpyTGnIFHlqKnZDv5psAbBc2llOnb8D3VL9w== 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 4P147z3V5HzlXr; Mon, 23 Jan 2023 22:11:43 +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 30NMBhn9012457; Mon, 23 Jan 2023 22:11:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30NMBhoW012456; Mon, 23 Jan 2023 22:11:43 GMT (envelope-from git) Date: Mon, 23 Jan 2023 22:11:43 GMT Message-Id: <202301232211.30NMBhoW012456@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 91d6657dbf9e - stable/13 - netlink: fix debugging on 32-bit platforms 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: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 91d6657dbf9e871c86df9a63c52ec49e8331af01 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=91d6657dbf9e871c86df9a63c52ec49e8331af01 commit 91d6657dbf9e871c86df9a63c52ec49e8331af01 Author: Alexander V. Chernikov AuthorDate: 2022-10-01 19:03:28 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-01-23 22:04:01 +0000 netlink: fix debugging on 32-bit platforms (cherry picked from commit c90bff3fa7c1c3ba3773759d243aad7b29b643a3) --- sys/netlink/netlink_domain.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/netlink/netlink_domain.c b/sys/netlink/netlink_domain.c index 159dfd03724d..032fded987df 100644 --- a/sys/netlink/netlink_domain.c +++ b/sys/netlink/netlink_domain.c @@ -98,8 +98,8 @@ static void nl_update_groups_locked(struct nlpcb *nlp, uint64_t nl_groups) { /* Update group mask */ - NL_LOG(LOG_DEBUG2, "socket %p, groups 0x%lX -> 0x%lX", - nlp->nl_socket, nlp->nl_groups, nl_groups); + NL_LOG(LOG_DEBUG2, "socket %p, groups 0x%X -> 0x%X", + nlp->nl_socket, (uint32_t)nlp->nl_groups, (uint32_t)nl_groups); nlp->nl_groups = nl_groups; } @@ -577,7 +577,8 @@ nl_ctloutput(struct socket *so, struct sockopt *sopt) break; } group_mask = (uint64_t)1 << (optval - 1); - NL_LOG(LOG_DEBUG2, "ADD/DEL group %d mask (%lX)", optval, group_mask); + NL_LOG(LOG_DEBUG2, "ADD/DEL group %d mask (%X)", + (uint32_t)optval, (uint32_t)group_mask); NLCTL_WLOCK(ctl); if (sopt->sopt_name == NETLINK_ADD_MEMBERSHIP)