From nobody Tue May 27 19:57:23 2025 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 4b6NhM2PGVz5xqVM; Tue, 27 May 2025 19:57:23 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6NhM1mT2z45cr; Tue, 27 May 2025 19:57:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748375843; 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=XF88t/UeAS1osnnOw7wsfIJchDo24I1CLNHMBjb+n6Y=; b=VnGSpcSDcstIapj7oi4H+J9Qj5ffyr4ga0z55cwdPE6hiSYtyJns/oHEBHFLJVkSoG1nQV F4ecKIas9R9qq+CdWyHs5xx8hMoWNPQ2U1//CxW+d9wEtm//75oJmVvwY+Laoel3wQqfrO Lvqg//UiPkdEbLuro2RL6cCXTKKKDurW2KUiLDsrLDQvbnIPc7TNaWM4GIm/vEZPo40+7n 9taKoNGnE1sr1ZD8ay8zSchNdEJtOp3S2CD4NXKt8LNjx7loO1+S4WJ+pmCAiLk1vYOZnm EqSuA0ZMRWY8odOPIWoMsbaw+HUA+1PF2trsgzz6+GN0OAey7AAB+ost2auWTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748375843; a=rsa-sha256; cv=none; b=fIWTex+30+J9X9x+Q0/sr/kExvEi21iMnUG9FUibGBCI9YFRuXG60LDwwbdDAE++vzlGAc 5eySjfM7l8nRf7NpK7GoEvmY4WpQEZWapZLKk0aWOlRYt+ab2rZpcRfIwg+9lTBlXLJTuf ukD5yQYNwzStSvr5RIMK5D1PsORaJaMrOqIpa2UYX2sPfcMb/MV/FcoNHGcQrAMmFx2i2a ojJG79PtjPUBzLEtWF+O0Yk/hUxZxNyj0Y/5mijjuFad8viIlproNktWfG6Efs0nUSYAD8 4Vd1uU+LzQOZhyUe0jvtCDwdiMoi4JSoOflf7u8+5jBWEj/WrM87ptcsvJY/jw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748375843; 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=XF88t/UeAS1osnnOw7wsfIJchDo24I1CLNHMBjb+n6Y=; b=dXrA/2bLic1aW0Ij5fyqaVeoZ4gDaO/fJ+V37np/Xw90cZlkMbv7dpLO1793jJ71I/I7MM 1oWWMOPz/gXbT0Q3UHPu8ddgBwXMPLkZETFBkam+bTQm+EhzwF9UJiE4FRFr7cT3CvkcuV /cyaB4N1CjEH1xX2wPK2oeSZIV61UHC8WBLKQ7ATMC1V0LIeSPOvDP6RYx81Ih11QwZEDo XF3wKImuw+NMFvBF5a2IFt+STbJdosg8DQx0EiWiui+tMCiWKRqOBY6qHoA+0waVg5IkLE r5riQXeAvQi1bXqf07GvXp3rZ/mcjSwK1OlD6NRdRG8kgf9k3pVLu2k3W0KdYA== 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 4b6NhM1Lzmz15Jp; Tue, 27 May 2025 19:57:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54RJvN5N029808; Tue, 27 May 2025 19:57:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54RJvN4T029805; Tue, 27 May 2025 19:57:23 GMT (envelope-from git) Date: Tue, 27 May 2025 19:57:23 GMT Message-Id: <202505271957.54RJvN4T029805@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: 9ccf7aeaa5dc - stable/14 - LinuxKPI: 802.11: mark struct ieee80211_ht_cap __packed 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 9ccf7aeaa5dc5ceb3bf896d84ee50294b841043b Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=9ccf7aeaa5dc5ceb3bf896d84ee50294b841043b commit 9ccf7aeaa5dc5ceb3bf896d84ee50294b841043b Author: Bjoern A. Zeeb AuthorDate: 2025-05-26 23:20:20 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-05-27 19:56:50 +0000 LinuxKPI: 802.11: mark struct ieee80211_ht_cap __packed In lkpi_sta_sync_ht_from_ni() we are casting the information element (IE) data to this struct as net80211 does not save the mcs/rx_mask. Not marking the structs packed results in the mcs information not being copied correctly and rx_nss calculations possibly being off. Even worse, at a later stage iwlwifi mvm/rs.c would extract the mcs values from the same field to pass to the firmware which will than crash in an assert as we would want to do HT with an empty MCS set. Sponsored by: The FreeBSD Foundation Discovered: while testing other features on arm64. (cherry picked from commit 6cbf8a04b1864d933506301cabe213a9c918d968) --- sys/compat/linuxkpi/common/include/linux/ieee80211.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/ieee80211.h b/sys/compat/linuxkpi/common/include/linux/ieee80211.h index 396204c3c484..fe2055f05969 100644 --- a/sys/compat/linuxkpi/common/include/linux/ieee80211.h +++ b/sys/compat/linuxkpi/common/include/linux/ieee80211.h @@ -304,7 +304,7 @@ struct ieee80211_mcs_info { uint16_t rx_highest; uint8_t tx_params; uint8_t __reserved[3]; -}; +} __packed; /* 802.11-2020, 9.4.2.55.1 HT Capabilities element structure */ struct ieee80211_ht_cap { @@ -314,7 +314,7 @@ struct ieee80211_ht_cap { uint16_t extended_ht_cap_info; uint32_t tx_BF_cap_info; uint8_t antenna_selection_info; -}; +} __packed; #define IEEE80211_HT_MAX_AMPDU_FACTOR 13 #define IEEE80211_HE_HT_MAX_AMPDU_FACTOR 16