From nobody Wed Nov 19 02:27:28 2025 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 4dB53n3j6Wz6H43j for ; Wed, 19 Nov 2025 02:27:33 +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 4dB53n1flMz3T8Z for ; Wed, 19 Nov 2025 02:27:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763519253; 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=wFnAmx5hqj+eWiXgnHAVa3gKErRWW89ZCseMnR94wMw=; b=n7vNTvajCaGLHFyihW4Edsh1JaNrYaiQYl/SWNd3MoldpSu+C9mx9MHwlz8ciaeRBmYCif e9CxJlCvwJ0TV25/qwqN7ZHbNn4wCj5eu0M3ufov/cu3eYwIF01p07y+2rGjE/qBb4EfV6 TirfxrkYjqHitLbysWExVMKJzd+0oivShrdC6yZjFDx32ULegujjDAdBWMIvzXpJeYEaPI eju6/VurpQKrY6WnWsfoLzaU5azzKDa3kZchK0qBCGFVv0YXIxQgh8KNVJJGe/+aVXpxDs VJoFGpXGn6QaCF9Z21+CvO2tqQhT7RqeGEnPNbQqe68U4bZgRqsFwMixmD2efQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763519253; 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=wFnAmx5hqj+eWiXgnHAVa3gKErRWW89ZCseMnR94wMw=; b=GisRH0+4/PJ9mMxeScDjp4M0mxwUPgYGfdUC/7d9dezxqMN4UcAF2+s6hgt2gKNH+Tns9+ nI+U/xXxEefURPr/ei7t6TUMXsRMS9CgJ+1ASqRlu//MB+RY6QT/2ciuD/dEzVEBrYRB7L RjMP32GNVfSXlNgDbul+0jwZSys2ReEO7fMN0TXPTuV00l0ZXfKIM1o7XCD+mAK1Ze5QoS jyb5+Ylhg7h6a43vwvurP0qFuAnIwUUd/RiOJVS4b8BDjvnJOPXIOyoHjXWNA36R/e7C+E BWnuPdmzTlBlqxmF/URgoHcvsXAjA9xNYUGru6rBFxhO4EGwR62Z3VP++VHX4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763519253; a=rsa-sha256; cv=none; b=EQUxHdKp7TrCUfgnIJqfsGb9CwJFzyUgy6hRziMAYRj3PZXbhf4h4b3xBywK5J3S4GGAKS CZbdCg5VAazz54UIjwjd4IEKQJ//4qDfCcnHzDuCAVUpXCN4yFyYIFRzE8one1sTPN+E6u yGuaGjgDWhqXbHB5QigYgcMNaMhoxSRNE6b8avHlTb+f/idBZMaz7e+DBXlmsQkA3JHelh elgsYU4rRde4bp5vNqF0wcXJ5L0fnKo2w3hmhLoapDm6aWdCUkT+ZEeS4CVA3y3Znf4F0J b2Ch6CzEqsS4O1Ff2jiKYZLJe6lQ2UQjqYZnO8GwWEgTvW4lAKMleHvYVWavPw== 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 4dB53n1C7Mz5wn for ; Wed, 19 Nov 2025 02:27:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2cac1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 02:27:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 9040277864ab - main - iwlwifi/mld: only get tid after checking that it is a dataqos frame 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 9040277864ab28cabfc53f238e900bc19ac75d7e Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 02:27:28 +0000 Message-Id: <691d2b10.2cac1.617e629d@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=9040277864ab28cabfc53f238e900bc19ac75d7e commit 9040277864ab28cabfc53f238e900bc19ac75d7e Author: Bjoern A. Zeeb AuthorDate: 2025-11-19 02:13:15 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-11-19 02:25:38 +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 MFC after: 3 days PR: 290808 --- 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 ||