From nobody Sat Feb 03 13:49:20 2024 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 4TRvBn17vGz59Qyr; Sat, 3 Feb 2024 13:49:21 +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 4TRvBn0B7Fz43V0; Sat, 3 Feb 2024 13:49:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706968161; 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=W+m6FpSKXwp+JguPPhFiJwwfqInYJjmp8LUevfEYRTI=; b=iQpC+lKSyFtnUUqom3FtR1OPLa7miUwLnqukiGhjbsOnq+qm4D4OcEfbfM/yNFNg34ZCTp V6bnWnKMmBHRCbBaKCf0vpB1MEb008PjmluQLD5JmhDm9UHwsY3l5vYU7paz2letGtFNE0 L+SIsChr82b99hfEjJaAUjFr1pFojOTATRHNqPmHa0nttqFrWP9PICKyASR6NriRmxV7vj wkn4vcbcn3a/2kQ6eGsqNJhjrBRUdGlcJKprcFzo/Sl16lEiQqBB0kI5GHMYYbCejgKHQ0 gxnwWb1etFr8Z16PDEWynlk8M5ziK1M/SZ5cOt7hYJCrCkY2jm8nuwSNXzsUvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706968161; 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=W+m6FpSKXwp+JguPPhFiJwwfqInYJjmp8LUevfEYRTI=; b=OeU87FrQXdGrvm7y2+eFRPXDq/IqbpX0Q3ysy3fT5p64Qz0MARKHsfVU9FWJB8EV830XJY tsUZazTa//thHxUCodFpqfGW20Rd8U/v6fkKEt9EA0Xn23ocmWfiGcjqiVDUF03Ppwqc5g 2316m02RTJD4jBHK9O3KUcv1RCxJrxsjuUAnpCyLjOqjuEIDyUD5H6FbaX7Zv7Gs7uEvGT W22i8Sp0xRRmW0bcjEeBUioDdmQVtqIlv/45VV1rhEUf87BXw7Ft6Ao2ivUK+/3LRsgVBu 7rRllHlLM1A9esWCJTSXg5KOSvQtLfSKp0tE1pcexV5QLbjZfBs1CqW1dK8gEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706968161; a=rsa-sha256; cv=none; b=pLm51KNyLziWKWL8fkeMfiAFVNduXzo5OdTynpy3iN7eQe7Urv/mS3zJK3mz2VxJhUMz9B Gpo9grgbEd2O6C0uXwEyyo+KMkBrEW1K2B853ofRn6jaRp30RA3DrkwiPNpJSFIbUKMuSJ r9dpUMapImSkQ3monLimhCc1wviDdlo5kCGT0ZUt/IJQ13rTzUWe9y7jz3ByCMiKzpGBJY uEXKx4J5GO4MUoQXocTEGidWF7frG37zFmLqBRtPuqY72P0KDiTo2aqgq8cn0GygzHhI/T 66Ku6Le9pVCtqUhP5cDmwd8ZFLnG4rU7G+6Z3HUBA+k7hooWtExLMiemkK4vpg== 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 4TRvBm6LmtzGS7; Sat, 3 Feb 2024 13:49:20 +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 413DnKpb039723; Sat, 3 Feb 2024 13:49:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 413DnKNm039720; Sat, 3 Feb 2024 13:49:20 GMT (envelope-from git) Date: Sat, 3 Feb 2024 13:49:20 GMT Message-Id: <202402031349.413DnKNm039720@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: e1d31d0685f0 - main - iwlwifi: adjust to make d3.c compile 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e1d31d0685f0b430f385023b7de49f47be6c7de0 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=e1d31d0685f0b430f385023b7de49f47be6c7de0 commit e1d31d0685f0b430f385023b7de49f47be6c7de0 Author: Bjoern A. Zeeb AuthorDate: 2024-01-29 14:23:01 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-02-03 13:47:34 +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(). MFC after: 3 days Reviewed by: cc Differential Revision: https://reviews.freebsd.org/D43647 --- 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