From nobody Sun Feb 18 21:11:25 2024 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 4TdJHx4zCzz5BmM1; Sun, 18 Feb 2024 21:11:25 +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 4TdJHx1nWHz42YW; Sun, 18 Feb 2024 21:11:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708290685; 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=GjqHLycaGMh23PZcNxTzJkclwknrRLF/KNq1HXCy7Jw=; b=kOhy5+edBWmCHgUhrtAkApC0azUjIPogcTgc9Vsj76xvOr1ODK4RPz+LSdStrTYhhG4rbX 5u8RCUixecVh3Ey51tUYE99aJjJ0mWotk4OI4TP/wzGAqozNEHzUcK6OM6BxVj9kDlrvao ejyDli0kcO1n8hMgboVbJb+LV1Vc64sEMPa1cTNJrHv+jQQZxQWiH3KzgZQSBzY4le60/d zgM/+7XHfKBxnP/S+sbuO777mDEJyTuu9X/S94yXM6GCsvU/IerczxL5lpaj6OgQZXHPZ3 OI9RtXL0uynD5wYxm4x+tgPBlbJ9cfPdwvBiYauWuSIoS0NXJ0iIDPU8Ftc2FA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708290685; 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=GjqHLycaGMh23PZcNxTzJkclwknrRLF/KNq1HXCy7Jw=; b=mcY6eZ4ATfHtzXgdYboCGvi/VECrW/C/79gU8K/WilYdlSKU+xZdRqpDgBN3Kh/D7YHjXi 9aO8/mPAGXD/VCnVodDmSIbSyZ4i4neWqk+e7a8JyQK3w63Ylve4k/h+kpqm4Uy40+LVAj njcEDrt9srfex6qE2cqUH1xKtAU28jLgnxBeuFEfo33YSgiste5/styK3f45jSfELaSCrl /8Ai0pqVuCt2aMSg+lRltqrlvLRhVD3uMIIiww8JbUJoViv3aHm1pckf6QK/7iofECNJiF cGLaesVTaHHEHu40iQMnDjO/EuWrwvK3uiysO4LuT8MDXyd1Mwiox2k8ER5oYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708290685; a=rsa-sha256; cv=none; b=ZF4DcWjNAcCHK5qzAATFoxWKoCjV+jbg66woC5k0G3Kqo9t5A3Agks2ko33Xlm2UCF4rkd ozV4cbRT8MAYdH6Ka0OwqgAIHROG1f/cyWnjKjwSKNBN0cxveJV0/PmypPRvISHRN77PHs HvsnksuvX8+KNF8dv2y05aIMjd5MdEEnXND9pzRcsb3E0PJtbNovdBicUtvavODqzj6e6q LFeXneAP//J5fN+4ioBKwUQWep240je95z4x70uHbBxj5oJmjWzGfIjKTnZyi68sneWOOC y60u4oKwm98onnARN9PAwTD7M/lA/OPUXznrRKDrLn9Na1euighqE/TnLP4YSw== 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 4TdJHx0vTDz16WQ; Sun, 18 Feb 2024 21:11:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41ILBPEi015780; Sun, 18 Feb 2024 21:11:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41ILBPwU015777; Sun, 18 Feb 2024 21:11:25 GMT (envelope-from git) Date: Sun, 18 Feb 2024 21:11:25 GMT Message-Id: <202402182111.41ILBPwU015777@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: 0e3bf4d95a13 - stable/14 - iwlwifi: adjust to make d3.c compile 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/14 X-Git-Reftype: branch X-Git-Commit: 0e3bf4d95a13a2a22fa25f1c8722afbb036c29c2 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=0e3bf4d95a13a2a22fa25f1c8722afbb036c29c2 commit 0e3bf4d95a13a2a22fa25f1c8722afbb036c29c2 Author: Bjoern A. Zeeb AuthorDate: 2024-01-29 14:23:01 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-02-18 18:31:15 +0000 iwlwifi: adjust to make d3.c compile struct iwl_mvm_wep_key_cmd ends in a variable sized array but later is included in another struct followed by the actual struct iwl_mvm_wep_key in d3.c. Make the array[0] instead of [] to avoid the warning about it being a GNU-extension. Also include string.h explicitly for memset_after(). Reviewed by: cc Differential Revision: https://reviews.freebsd.org/D43647 (cherry picked from commit e1d31d0685f0b430f385023b7de49f47be6c7de0) --- sys/contrib/dev/iwlwifi/fw/api/sta.h | 4 ++++ sys/contrib/dev/iwlwifi/mvm/d3.c | 3 +++ 2 files changed, 7 insertions(+) diff --git a/sys/contrib/dev/iwlwifi/fw/api/sta.h b/sys/contrib/dev/iwlwifi/fw/api/sta.h index d62fed543276..18f9470db301 100644 --- a/sys/contrib/dev/iwlwifi/fw/api/sta.h +++ b/sys/contrib/dev/iwlwifi/fw/api/sta.h @@ -477,7 +477,11 @@ struct iwl_mvm_wep_key_cmd { u8 decryption_type; u8 flags; u8 reserved; +#if defined(__linux__) struct iwl_mvm_wep_key wep_key[]; +#elif defined(__FreeBSD__) + struct iwl_mvm_wep_key wep_key[0]; +#endif } __packed; /* SEC_CURR_WEP_KEY_CMD_API_S_VER_2 */ /** diff --git a/sys/contrib/dev/iwlwifi/mvm/d3.c b/sys/contrib/dev/iwlwifi/mvm/d3.c index f6488b4bbe68..17d74a771d13 100644 --- a/sys/contrib/dev/iwlwifi/mvm/d3.c +++ b/sys/contrib/dev/iwlwifi/mvm/d3.c @@ -7,6 +7,9 @@ #include #include #include +#if defined(__FreeBSD__) +#include +#endif #include #include #include