From nobody Mon Feb 19 08:07:53 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 4TdZsQ0m4zz5B30B; Mon, 19 Feb 2024 08:07:54 +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 4TdZsP6fWFz4KXW; Mon, 19 Feb 2024 08:07:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708330073; 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=d3BVNCpieAXLztGUMeSzFsvM9Xh+qsD3NReqI4hxlLw=; b=feRCjf/A/H+jhc+znL7ddllLWp3rNcL5Mgma3Eu8/IFW9+d+CzERGYoldl48ts/2cq5Dhu 2OzByeeZrelxrFEIEo95aTmRPTWVz23S5C78ntTYSiY1tTiDtp0vWynwo0zzNKd2oVyGor mgTyhQUyxD6G0GgmP55EzM7gva5ySzbC4fWNVaWPQvdlCjCiyoF/0PUCFhvbpy4TggT4Bf btIaqvH6Seyky758bUUzCIJmOF+7pWL4pzXzxst2fsVOtPcRi8/wVquezjsjJm/TdyIMmb z6pEYIxpzOFds8v3wostywG4+x7MsXHIzz8IbwUfbPDPC+EMFrniFLhoWW0OOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708330073; 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=d3BVNCpieAXLztGUMeSzFsvM9Xh+qsD3NReqI4hxlLw=; b=PBlDjVl5fCit5ziFX5EpFodZsiY6Mq49add9d8p3n3YJu1dl+GkGAk1jJ1ulGYoCJ4ZiXd Mk6JMKJe7zadJbYn3a5u1Mx34/WWD0nTQ+u2QfyENjTUq70IxX8M5DeOtn/KymCCV6HnMt 7obmh58dLplg/Z3sDwCyKkHP8N/a3PBEfxmQ5DHfVEABLMt1kCAa9LPzObotd5vwX6FRhu fTJvDGiIZEyA2wnnJeWhONz6ZVxsWjHRHXSd0x2/Dx80+ood/3yrbqQmZRXHPDslG+SUfM carB76LeMbb7pEtYjeGbS9f8sAlL4jHEFTjFI9+xOkvXDErJa5wFwIfgKIqKNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708330073; a=rsa-sha256; cv=none; b=aZXb6D47xm0WTriD1Ifs0RfC7yok5BEUTkFgz7y8qnGTimtu7+b3O7UEzJrwU7UmTVQIsX xu+Vjb0uTKvcIBPpS4jkCtIrko9JeoOUtF0KTdogP0Nb2y7jGtZ+ZwmBSh1oxscjUHatGE zFD/MxoReKs8tiMLBvD4HaVH/rWr0JoDOR+2p4O1TGPh9x2zcDDhQ+RKr/tbftqtD4oEPo l1EZyuFn22xxLoehsi9tLR/pI/p7TIRjXe61zCbPZjGoIkQglke3Rtla7R8t+NFB0QimTe /u+XSLWc7/xO2uwJn1JT5ZpZMDZN8QlpdKeafo2R615F/8R1PMoomA9ul2gabw== 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 4TdZsP5jC6zRDm; Mon, 19 Feb 2024 08:07:53 +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 41J87rWR016026; Mon, 19 Feb 2024 08:07:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41J87rdx016023; Mon, 19 Feb 2024 08:07:53 GMT (envelope-from git) Date: Mon, 19 Feb 2024 08:07:53 GMT Message-Id: <202402190807.41J87rdx016023@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: bbf3fc5b00b8 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: bbf3fc5b00b8fdacbb3b941dc953c3253a7b4f31 Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=bbf3fc5b00b8fdacbb3b941dc953c3253a7b4f31 commit bbf3fc5b00b8fdacbb3b941dc953c3253a7b4f31 Author: Bjoern A. Zeeb AuthorDate: 2024-01-29 14:23:01 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-02-19 08:02:00 +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