From nobody Wed Jan 18 16:25:01 2023 X-Original-To: dev-commits-src-all@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 4NxrhG3w7vz2yJg5; Wed, 18 Jan 2023 16:25:02 +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 4NxrhG1YCYz3FZn; Wed, 18 Jan 2023 16:25:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674059102; 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=TzthT3G7oLash7aCHS22CUvenm7LRboCsmTeWvjpxoI=; b=PTf6mNT+vWJoEKkU2H4UltUqa7BAUMnwjaWZFQh/HBGRSVe/1AEScrSpLsi+W5RD6+eJcv +YzwK6uhr2lbETySLk0D6oQ1GaHn1dIcDFZCMIU1c7qaBuSQpioHBD4XptiHjc9KGQbETf WYESNe17ja8FWSW+9+SXSKceU4/NoxCIgAQnOFEj/3yzjZ8MJXmK34z9vZKU5XDLn2kqkn s5t38eNG6dBMXZNTpwGp1sfQ9xJM5fbMC4DZUuoWaKxNagi/mgUe7pc6XthM4mcXcPzoKz 69Id5lkMTTnouV8fu5/ha9DdhM1ZLY5QdUbMduHSTEOw4fx/2y4bsdlsRATymQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674059102; 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=TzthT3G7oLash7aCHS22CUvenm7LRboCsmTeWvjpxoI=; b=VIwxiHvS6qIF+hQbehhsVgo4GsW3x+7qh3GxRgRTU0hTcCnH6vcK7s1RSxKYHHQtzcUnfj Frp/nPB/BbfFhT5LC3O2e0ZeWjcF8o2c2Nzv7lCvEVMsWl7Jhso+dIj8h4nGclMFIjI7vo w5J01yl+wzT42zvXAuwXfvGCkPTXiZ7fYNEhUB4FC9VJbNMikJ7xqYHFgugKh65G5+VU+8 Mhe41HDrTHihXmA2FSr3DU4+HQbC8r0SjDhThGcG+3wdGjQvC+aHrhMtM/1htZA2IxEdBV RGLGpYvnVHFWCqDALvR5jpROKg8jcU0EwypRWtgPxaTG9Itp8iF2FQkcrVveUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674059102; a=rsa-sha256; cv=none; b=p8rdhbdR4f+fmgjMYpoyKzG5aR/uiuvAC486+K7AgkQ/a6dUMcrtgHtQbVcz75t1cweFHb obBdV5sJKfGA7NL1zfPSftTxv3dMxmeyzzTVzVN/QuhATlqTPagcGPIPAWILYnUap3xVaL bZDpUqCoY+cE3WSaQZ+564xCQP/x2ppzP/y5hhxQUI99IiGitHoI/ZhTz3grPeCaoRk9PH LsMJDZv5moQ1U3owYfe4cuilR/5QLas1pjterdSW9xbxVmc6sBhfW7TWQOk7qzGjAYt0rd Uiwqpw0w178a7gfFtr/Y5Kc5Qq+djjQEijvaF97j6XhdfUYb6zmeV1/5wA5Pbw== 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 4NxrhG0NvPzJB5; Wed, 18 Jan 2023 16:25:02 +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 30IGP1Zf038233; Wed, 18 Jan 2023 16:25:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30IGP1iQ038232; Wed, 18 Jan 2023 16:25:01 GMT (envelope-from git) Date: Wed, 18 Jan 2023 16:25:01 GMT Message-Id: <202301181625.30IGP1iQ038232@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: a96d4c86f1d4 - stable/13 - iwlwifi: mark a declaration for a non-existent function List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: a96d4c86f1d4e22182bc8b5de92ac84a1e1dff22 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=a96d4c86f1d4e22182bc8b5de92ac84a1e1dff22 commit a96d4c86f1d4e22182bc8b5de92ac84a1e1dff22 Author: Bjoern A. Zeeb AuthorDate: 2023-01-13 01:00:00 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-01-18 13:26:26 +0000 iwlwifi: mark a declaration for a non-existent function iwl_trans_pcie_send_hcmd() does not seem to exist (anymore). Mark it as __linux__ so we can submit the cleanup with the next upstream run. Sponsored by: The FreeBSD Foundation (cherry picked from commit f797d5f37089de8134b4599bb033635ac7d07bef) --- sys/contrib/dev/iwlwifi/pcie/internal.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/contrib/dev/iwlwifi/pcie/internal.h b/sys/contrib/dev/iwlwifi/pcie/internal.h index f7e4f868363d..cd2fb7811e4e 100644 --- a/sys/contrib/dev/iwlwifi/pcie/internal.h +++ b/sys/contrib/dev/iwlwifi/pcie/internal.h @@ -526,7 +526,9 @@ void iwl_trans_pcie_txq_set_shared_mode(struct iwl_trans *trans, u32 txq_id, int iwl_trans_pcie_tx(struct iwl_trans *trans, struct sk_buff *skb, struct iwl_device_tx_cmd *dev_cmd, int txq_id); void iwl_pcie_txq_check_wrptrs(struct iwl_trans *trans); +#if defined(__linux__) int iwl_trans_pcie_send_hcmd(struct iwl_trans *trans, struct iwl_host_cmd *cmd); +#endif void iwl_pcie_hcmd_complete(struct iwl_trans *trans, struct iwl_rx_cmd_buffer *rxb); void iwl_trans_pcie_tx_reset(struct iwl_trans *trans);