From nobody Mon Jan 23 22:11:44 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 4P148106s8z2t0Qt; Mon, 23 Jan 2023 22:11:45 +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 4P1480650gz3KHm; Mon, 23 Jan 2023 22:11:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674511904; 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=Vfbfd5h49bRQkbzTLhPsn1sQ/UDT7mN4c8/Ug8p84Sg=; b=BHHuMUKWVwjdH87UofiJJjqV2ipGUngmKUisBlz0jUZ9434hL6zE6mg6QTfHtU9mtwA/Ev St+PpPub2lwL9ih8VsTHo7B1fIQjDZ9DBk8GRjUL/U9Dnq0DLbOx4/deqhoJ9IaCr/1zNE 5Pl1ulVgBnblbliKvOqq86dqS7H3+GRPtkaWr6qZG60IbQGLbQH+PT3UZQPSy330PH+fB5 M1sV+q9TZFtDYdzMZIP0FayHTRXSpbOGurxC2QnIUUWpnHzshIEoEEXA7Kcj2iHR/62BpH Mnipsscfcx1kCNX5TMEdKxCeK4GcjeCH8z9ukwWbVthcQFrxRfpyvWXrOOMbOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674511904; 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=Vfbfd5h49bRQkbzTLhPsn1sQ/UDT7mN4c8/Ug8p84Sg=; b=XkX+wCxy9whSdVRTvwKPzLVaQ8dCHcAT2u/sZQNBrI4CrpzEIX0/dYv88q+Rl61soVM7O2 4Sznh2rl+DYp1GerKhIcfeDCcjb5Z/3oyvOm7WXbzi83Vd0/6BSq8Na+vBgQ44PQ03uVUI sRRoRk3UTWllaUmKTAfuS92Wd2eniZTEfExxU87ooR294KI6f2KNXwbt8zGFFiNLATyBp2 b8A1DsJblHxxXeXG+G+RwF+wCy1DKy8qJU7Fmf6Qs3klfUsFzhYhudROsmquCwJ9pYNmYI ULKlMNBJM/yzKcnOzFZvsC3fBGxOBhsm1vC5lEkqB2/WFg8HQ8w3vRVJLuz+vQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674511904; a=rsa-sha256; cv=none; b=S354t6i9EmaTXrIGlFRQAShoBY6xWsprNYoiHfwdGa+9dTCdZTR8M0VOkQvNT4wi1KJPZB apa7emIdYdw5vhTphyhFn36cObLuL2ouEngjP8MTnZHwMafd53uge2UBxJrrvOyGMkcVgX +M92jx1XO1eQlXpOmb/HGeujq+JmiyrqUd5FQANkaJoX1gnK+kxTvHHsnR1H+6EWtX03R5 /yADFOd/4VidX8CMxNEZeqWOjZnpUSM79C1UyBzJn+0EX+H1xEqg7bMV9FZiVOACPZxfVx ZngC3u/McK4PACO7JKdnfTE6bNx/RC3F0QoBwHLLWPHmseT+hnMPk1cEktKI0A== 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 4P14804fqXzlqw; Mon, 23 Jan 2023 22:11:44 +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 30NMBiOr012481; Mon, 23 Jan 2023 22:11:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30NMBiuH012480; Mon, 23 Jan 2023 22:11:44 GMT (envelope-from git) Date: Mon, 23 Jan 2023 22:11:44 GMT Message-Id: <202301232211.30NMBiuH012480@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: 21f82ec32e11 - stable/13 - netlink: fix format strings 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: 21f82ec32e11a773d9e1ea92e1688a4d617913ba Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=21f82ec32e11a773d9e1ea92e1688a4d617913ba commit 21f82ec32e11a773d9e1ea92e1688a4d617913ba Author: Alexander V. Chernikov AuthorDate: 2022-10-01 21:16:31 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-01-23 22:04:02 +0000 netlink: fix format strings on 32-bit platforms (cherry picked from commit 8d9f3e05728ecef4e21672dd8a54066b17b62a50) --- sys/netlink/netlink_domain.c | 1 + sys/netlink/netlink_io.c | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/sys/netlink/netlink_domain.c b/sys/netlink/netlink_domain.c index 032fded987df..936a5438fa4a 100644 --- a/sys/netlink/netlink_domain.c +++ b/sys/netlink/netlink_domain.c @@ -37,6 +37,7 @@ #include #include #include +#include #include #include #include diff --git a/sys/netlink/netlink_io.c b/sys/netlink/netlink_io.c index ef1c2c73a10e..5a0f195ed382 100644 --- a/sys/netlink/netlink_io.c +++ b/sys/netlink/netlink_io.c @@ -282,8 +282,8 @@ nl_on_transmit(struct nlpcb *nlp) struct socket *so = nlp->nl_socket; if (__predict_false(nlp->nl_dropped_bytes > 0 && so != NULL)) { - uint64_t dropped_bytes = nlp->nl_dropped_bytes; - uint64_t dropped_messages = nlp->nl_dropped_messages; + unsigned long dropped_bytes = nlp->nl_dropped_bytes; + unsigned long dropped_messages = nlp->nl_dropped_messages; nlp->nl_dropped_bytes = 0; nlp->nl_dropped_messages = 0; @@ -385,8 +385,8 @@ nl_send_one(struct mbuf *m, struct nlpcb *nlp, int num_messages, int io_flags) nlp->nl_dropped_bytes += m_length(m, NULL); nlp->nl_dropped_messages += num_messages; NLP_LOG(LOG_DEBUG2, nlp, "RX oveflow: %lu m (+%d), %lu b (+%d)", - nlp->nl_dropped_messages, num_messages, - nlp->nl_dropped_bytes, m_length(m, NULL)); + (unsigned long)nlp->nl_dropped_messages, num_messages, + (unsigned long)nlp->nl_dropped_bytes, m_length(m, NULL)); soroverflow(so); m_freem(m); result = false;