From nobody Sat Oct 01 21:16:55 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 4Mg0KN1Xk8z4f22L; Sat, 1 Oct 2022 21:16:56 +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 4Mg0KN17Xqz3Myv; Sat, 1 Oct 2022 21:16:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664659016; 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=KaU08tYMcPRERfLzR34TBbGYB68fHhOUO+eI/Igzyrk=; b=qfyEyg1qKVX3VPecFMVtYYbLwG1A73Y3JSwLOaYVLtA0yWVTNUCqcGY39Zjg4nzHzHG2pv NpzoZWvUXm3FBLpUz/x2mjT8nptYuJYGOX4XZJGCZXZSLkfHXZF25VuuzZJ98qE09IT00i TfT5NJ6LhPmz+P11sSwR5pxWSkjOmsPeHcFEUjmM98V5YyvKxHFA8s8MPHqTL2jojQGmVU cH+ZnEzivFBYTehtb7WEAO0x8/Yfrz7ASyRBjmIO6qfxzagXoAmehLOu53Wwqdf5tDrh9K 8flsUqDtOxQ+Y3RZWf7I53lk7yftDKyjvjdQaqtYXq22hQ/xALlfZtfvHoPU4Q== 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 4Mg0KN0B3DzfTq; Sat, 1 Oct 2022 21:16:56 +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 291LGtfl021600; Sat, 1 Oct 2022 21:16:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 291LGtpH021599; Sat, 1 Oct 2022 21:16:55 GMT (envelope-from git) Date: Sat, 1 Oct 2022 21:16:55 GMT Message-Id: <202210012116.291LGtpH021599@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 8d9f3e05728e - main - netlink: fix format strings on 32-bit platforms 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: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8d9f3e05728ecef4e21672dd8a54066b17b62a50 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664659016; 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=KaU08tYMcPRERfLzR34TBbGYB68fHhOUO+eI/Igzyrk=; b=joyW6g+wk4c7yQZ5T0IsvcKvk4qpmfZfNOE38ufBhmY83pienKelThTgik2NYaVRFvzKiI PVhzi3+13qMlxdJt62ldequ/T0q4/EEXaBoJkNzPFw0nNH/e5syllk7tuh5dX1k/bWwOMP U3Vp99+39X62C9oeuOaOm8tzLs/vsUKQ0IHSi6ljPaS+TGok7taAM7x3NF7Mjrl8/nV5Iq cN6lO4mBCimU/kNPkQT6tXKR934Zt1oLznqlh/IlcJ/B9EnZIsfNQZnEwe7tHxQ+RVidrJ xDyiRkPDx5Z2lRVQwLrA1Bq2ijdR5YHnJ9EL3Ejnx8x04yQHWSKi2VjZPOV/kA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664659016; a=rsa-sha256; cv=none; b=NMuRvOdRaG7EvbBn7SvF5iL4x5KApNWAfzCgyZgNH4vV61rXkm4MGUQfzHbrmJRa7cLZW1 VA/1ZLhbQa9GhannY51KMDERNjr06OAGfPH8edv818GPaHytPFI+1FYCC+zND0SE8ktIyX zN3QyEdXibdbgaDz/R7BFnQrDeoCntk983XVFerCrQJ6eIDsu/yaBWVxwx6faz18nYOOht Or6Q3V7OLK88OrwJeCOVGMlketBP1JCZSd+t+9pNpWl37HFnVkM9QC335J0mFTjLb1ab1B Dyxo6eMU7oZrTqGOQuOCtpP82xLG7+N7i5Wl/eAHOoqT6ZGvPI686mmPo7TIIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=8d9f3e05728ecef4e21672dd8a54066b17b62a50 commit 8d9f3e05728ecef4e21672dd8a54066b17b62a50 Author: Alexander V. Chernikov AuthorDate: 2022-10-01 21:16:31 +0000 Commit: Alexander V. Chernikov CommitDate: 2022-10-01 21:16:31 +0000 netlink: fix format strings on 32-bit platforms --- 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;