From nobody Mon Dec 8 15:44:09 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 4dQ5r96f8Tz6JyY5 for ; Mon, 08 Dec 2025 15:44:09 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dQ5r95DHgz43wY for ; Mon, 08 Dec 2025 15:44:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765208649; 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=D6PMoLRMW+opYrIUJlS6YmuHoo/cAKoTo49SmoFy+E4=; b=EY4PQMhvA1cJqPCe1mA497+1fnbpKi1I4/VLTUCCLYK/ad2duaFVvPniofqzQZ77tnxpZ1 32EWnQraKPdv//Ia3DhC+8NcRx/fmb6WaRJpSFJo/cFbyj9fYOtT696jV4f9IOh3Ei3YC0 tq/NK0UbXaCPo41feZe1IUsnSohY6L8GLl0MSUckov7nEPGtrCmbReE9EpFoXtCrQfcvM6 ZHoBaPlKBZ2lfHS7WjM1HwbT3gESyC3CRxy2UpdqU+E5QaVoTWmQKjAVe8Udn3FsFdAMLa /VkOY2Iu03tswTHWjjTCcyBYa6Mz8r2nQhTPgAM+3UmClF0NoZKwQ4AGpQRrfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765208649; 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=D6PMoLRMW+opYrIUJlS6YmuHoo/cAKoTo49SmoFy+E4=; b=ErQBjTASHiFoeRR8ccVnkQVbBzDwOdjm+HF/wVwFgD5sbFYgNEfijURWE7R9E0ZR6bYGlK 2q4OvjdKumv/EH7AKMWk1AmenrjodcGXn+wGdsv239sFWWuZgTlDKHENj+FsrrPGjmKO/T 3Cf/kfNf1qfGUa8UAzszqgvlWli7M2uX7TKaIQUUjOXCQLU5FkSuHJNkIaZp8E2QzG6vpf m2RjpC3dqMxnKjxXjgg9Obk3X2VOB+AawjrrOfzC9X/Fy+MW2CBsVgh34os48fBr+AlDQW ZZjQyQo4jKydhEAakj6SFCGzrVO6WY84ja1loLulyaQWytTQiioNB2tU1sExMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765208649; a=rsa-sha256; cv=none; b=CoX8yHYnZ5sOXFIo7IInQUgX0Cd8Tl4EQwRN2QsSVuSRt4Lwshj4VeFxqyuHSj3NdJpcXf TUsOrLWLAjtGGLEg0ElNAIgXDuQuLjc0eNhyfm9deJ9WVCgPBRFqZmFZU+YhOOkK7glW6/ ngQZtxDxPnavZ6Zqk2hVoAa7nAt+DF6vNyYyJx/VpKy+Kcq/JGukUy2arZuHY5ChSQLzKf osCEfjUzj55Nw/FddUluH+vJu/abuO3XgkWd7W0+o5lSSReFg5aI4wrm7e4CkfVRFyE/gR 088fG3LkAODGFAFqiBQCKw5QjbHgd79zGELqoAnptUfYWR69QwpLOGklO3U7Bw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dQ5r94qXdz3hX for ; Mon, 08 Dec 2025 15:44:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38759 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 08 Dec 2025 15:44:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 4dde7d280a5f - stable/15 - iwlwifi/mld: only get tid after checking that it is a dataqos frame 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/15 X-Git-Reftype: branch X-Git-Commit: 4dde7d280a5f2a0218632b995d916fb1ae10cd7f Auto-Submitted: auto-generated Date: Mon, 08 Dec 2025 15:44:09 +0000 Message-Id: <6936f249.38759.9e849a8@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=4dde7d280a5f2a0218632b995d916fb1ae10cd7f commit 4dde7d280a5f2a0218632b995d916fb1ae10cd7f Author: Bjoern A. Zeeb AuthorDate: 2025-11-19 02:13:15 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-12-08 15:43:50 +0000 iwlwifi/mld: only get tid after checking that it is a dataqos frame Like we did for mvm, only get the tid after all the other checks are done by the function in order to not trigger an assert. Linux will likely return a random value there which later is not used as the driver does an early return. In LinuxKPI we do check that the frame assumptions hold up, which does not go so well for a random frame. Sponsored by: The FreeBSD Foundation PR: 290808 (cherry picked from commit 9040277864ab28cabfc53f238e900bc19ac75d7e) --- sys/contrib/dev/iwlwifi/mld/agg.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/contrib/dev/iwlwifi/mld/agg.c b/sys/contrib/dev/iwlwifi/mld/agg.c index 3a346bcd6665..e3bc8767297a 100644 --- a/sys/contrib/dev/iwlwifi/mld/agg.c +++ b/sys/contrib/dev/iwlwifi/mld/agg.c @@ -201,7 +201,11 @@ iwl_mld_reorder(struct iwl_mld *mld, struct napi_struct *napi, struct iwl_mld_link_sta *mld_link_sta; u32 reorder = le32_to_cpu(desc->reorder_data); bool amsdu, last_subframe, is_old_sn, is_dup; +#if defined(__linux__) u8 tid = ieee80211_get_tid(hdr); +#elif defined(__FreeBSD__) + u8 tid; +#endif u8 baid; u16 nssn, sn; u32 sta_mask = 0; @@ -243,6 +247,10 @@ iwl_mld_reorder(struct iwl_mld *mld, struct napi_struct *napi, for_each_mld_link_sta(mld_sta, mld_link_sta, link_id) sta_mask |= BIT(mld_link_sta->fw_id); +#if defined(__FreeBSD__) + tid = ieee80211_get_tid(hdr); +#endif + /* verify the BAID is correctly mapped to the sta and tid */ if (IWL_FW_CHECK(mld, tid != baid_data->tid ||