From nobody Mon Nov 28 17:26:51 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 4NLXT76pgLz4jQm2; Mon, 28 Nov 2022 17:26:51 +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 4NLXT76LVyz42rs; Mon, 28 Nov 2022 17:26:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669656411; 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=0IfXm15Tsud+BCZOvhbUSv6QkPbzaMsQaJtlrmoK32g=; b=DlkM18Ny0u+v44ulx7AvTSvGglfiQeNPM+6rQKJpQkJCQT5ppXcfL5sAw0JLtDvggHhCim Nq4qR21MxjtO/R7DtPm/R9aW5EOJo5iCJ5IqjP7b+CQ1EGX3MLkxZYpAKrMpmUimP6S3H9 xpfnXNZo9JioEA4k6lC3DGZgdpkTzNYBzPuPCJj6vOfkeh19sATqejIOxsp6oc+vN5ZXk4 FSgUUrbaW4LQXv5ddVx1nggN6EDVM52ELqYHKhT0Ab2Q9Wym7UhqEBfJHF37KiRtUol0IA M33pg786FBQImOCiW+S53dTQKwiYlzb9w/RXjqeosMODIE/GGtPzlMnt5qiFAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669656411; 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=0IfXm15Tsud+BCZOvhbUSv6QkPbzaMsQaJtlrmoK32g=; b=NoEKQBV4VkfmXdUxO26b5wd0cwnUtG+fxMgmRY/BZ8hL5B6f449FP3OZGiY0zKHrDHUhG+ bvfOvvqxdmzNjP0feOWjhqOcJxm1Tbfo8To61V5Io65sndhXNdRarFrm1WRrzTxNWZGM8Y T+j20L5YTYoWG0oMakdq6kAfdcvOMiH61lkqd6c3ANA/QSZ8QOPz1SkNHn8MwUMcsXmsG8 hdmxFRWi1r8GCEayN4xcjDaE5ntd4DruJ29HzwQIcfpe+20dZJpwIO9HT+iwspWxGML60Z gSVVUnaW43TdtjtdfXsoY6RTUADOcHcH+7EAvjXcFn1y6DBow+qUAgvrZOxi8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669656411; a=rsa-sha256; cv=none; b=f7U873qgUFbEXaZPY3iE3jm6c/x0C+Ul6hv34fAqrP/noacDAV+T4pfC5QmbNOGc+Rw50C horlYuKjdaCf+6H4QCU2PPog6zOZFnouxEGa7SexlFcWdD2XlSxBkiqoflBTlMvCpiffL0 T3BnRInzI+b0Um0yk6In0ud4JVojoe13LLalEznhbgxTbyhc61db0YwHHxpYJIVtdX1wdo PbSFfMA7nfrAVskky2v/gaSQ6xx1+N+lqMV1FIP9gxoK2LIgHKY6dUYkmpUYr74gNIdVPM /aJeUos61ZwFWUTff1z/use+Dv+Rft9mS7INf+4OjcJUz9+4aVaReXTFgkKp3g== 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 4NLXT75Pplzlpj; Mon, 28 Nov 2022 17:26:51 +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 2ASHQpVn080927; Mon, 28 Nov 2022 17:26:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2ASHQp3R080926; Mon, 28 Nov 2022 17:26:51 GMT (envelope-from git) Date: Mon, 28 Nov 2022 17:26:51 GMT Message-Id: <202211281726.2ASHQp3R080926@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: c0c2965f74ee - stable/13 - iwlwifi: constify another argument of iwl_print_hex_dump() 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c0c2965f74ee7e4052a462613e837c9680861d0f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=c0c2965f74ee7e4052a462613e837c9680861d0f commit c0c2965f74ee7e4052a462613e837c9680861d0f Author: Bjoern A. Zeeb AuthorDate: 2022-10-22 17:33:18 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-11-28 16:29:45 +0000 iwlwifi: constify another argument of iwl_print_hex_dump() This is needed when enabling debugfs as it passes a const in which would otherwise be dropped. Sponsored by: The FreeBSD Foundation (cherry picked from commit 71ebd2d00b9618325ef6d0bb8c224d3d5f32160a) --- sys/contrib/dev/iwlwifi/iwl-debug.c | 4 ++++ sys/contrib/dev/iwlwifi/iwl-debug.h | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/sys/contrib/dev/iwlwifi/iwl-debug.c b/sys/contrib/dev/iwlwifi/iwl-debug.c index 5bb61151b93b..5a9c8bc70168 100644 --- a/sys/contrib/dev/iwlwifi/iwl-debug.c +++ b/sys/contrib/dev/iwlwifi/iwl-debug.c @@ -115,7 +115,11 @@ iwl_have_debug_level(enum iwl_dl level) /* Passing the iwl_drv * in seems pointless. */ void iwl_print_hex_dump(void *drv __unused, enum iwl_dl level, +#if defined(__linux__) const char *prefix, uint8_t *data, size_t len) +#elif defined(__FreeBSD__) + const char *prefix, const uint8_t *data, size_t len) +#endif { /* Given we have a level, check for it. */ diff --git a/sys/contrib/dev/iwlwifi/iwl-debug.h b/sys/contrib/dev/iwlwifi/iwl-debug.h index dac2c6b31562..43288a5a8d74 100644 --- a/sys/contrib/dev/iwlwifi/iwl-debug.h +++ b/sys/contrib/dev/iwlwifi/iwl-debug.h @@ -109,7 +109,11 @@ void __iwl_err(struct device *, enum iwl_err_mode, const char *, ...); #ifdef CONFIG_IWLWIFI_DEBUG bool iwl_have_debug_level(enum iwl_dl); +#if defined(__linux__) void iwl_print_hex_dump(void *, enum iwl_dl, const char *, uint8_t *, size_t); +#elif defined(__FreeBSD__) +void iwl_print_hex_dump(void *, enum iwl_dl, const char *, const uint8_t *, size_t); +#endif void __iwl_dbg(struct device *, u32, bool, const char *, const char *fmt, ...); #define IWL_DPRINTF_DEV_PREFIX(_dev, _e, _prefix, _fmt, ...) \