From nobody Wed Sep 21 14:01:28 2022 X-Original-To: dev-commits-src-branches@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 4MXg7Y0Tnnz4cY5N; Wed, 21 Sep 2022 14:01:29 +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 4MXg7X6Nrmz4B3w; Wed, 21 Sep 2022 14:01:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663768888; 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=fHx3ys/1FpBLVFYs2ZyhHPVZa9COhOhS66a4W01/oLs=; b=TdjWjq6bAmjdaVGacYvsxkHUws2ORQjv0KOkkiptY9JaSly7wuWpgQPW8Y6GQHyCl/OBt+ q4rxV97Na8Buru9l9kFk6Yv4faVdZ3NG90saoUUBo11BSon13ZCx16x6HZ5iUJpKgvhEEr XBGK2chb5wCnIo6pyLtA+Cv5hPd4BSbYiCjF0et1oEVD/f8G9vqYA2MOqPLd5cnym1AVrY 9hvRUNHEPGQ5Voa/5XlpCFnoOXu48NpMLK+jLkfBSmaL+iF2OQIUoU2x82i+YG+MP7h/xo wbvYUcNUrP17IuwCsVKvc0j521K4vnNxEnJZO2xmQh3zjRPF0tQ3cVvjsUuqGg== 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 4MXg7X5HB0z153T; Wed, 21 Sep 2022 14:01:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28LE1SZJ000206; Wed, 21 Sep 2022 14:01:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28LE1SKW000205; Wed, 21 Sep 2022 14:01:28 GMT (envelope-from git) Date: Wed, 21 Sep 2022 14:01:28 GMT Message-Id: <202209211401.28LE1SKW000205@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: f92932149af5 - stable/13 - iwlwifi: move an ieee80211_get_tid() call List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: f92932149af5fd881ff68e372c4b72c9b28256f5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663768888; 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=fHx3ys/1FpBLVFYs2ZyhHPVZa9COhOhS66a4W01/oLs=; b=M9GSX60/CPO6BN86/PxmxGYTotQXqWRSwTJ0+IRUvCxRI3neeGq7RfWMHYBIeweFGMpVbi V/BhbGCvCS0jqcvqYjXezbWOqoJ3hkH0SLHj1fK/mDJ7sViAP5BYiO/aXDptKutA5594sW KG17BZzEyzGPy/b2btFdPxdUgueH4FEcXk+WDUmGHuT1RUlgIxufo66fTtLmFX3qU/OzpD ReIcLPMQ0paWENzWx/nnbdduvccIz0g28f2pnhPUiso8joHLOpr4kdY2h5twMVC8ODR4mL VRD+1SAMTZ9jr0igCE+3SavjcEy8hTFUBXnY6CzoaLn2fGWaKSFORmGJmj8sLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663768888; a=rsa-sha256; cv=none; b=Nxo+xoy+guFS2lXeU4twmS0/MX9zn3mIYgpeYUoy+cHMbLXpXOgBpVxfEdIWXAxMaUcIgE oXqIcC1dtOSfQzXqeo8VdMJR2cM+RPJN42bUk5Q+64WgvmhTGG9cFfYmH2pnLRc3d2g/wW lyjEHY7axh5mZyr1xeklMN5d3oSCWXOJiS3asWTeinRR+gQR982rVa+wWbq1/8JcNEEUyM vMl5xqyB8BtxbFjgUbPCX4KiyU9FEyr+MGJ2n/mbXiHpgMGQp8R7VTAk+lToxYF9iGPKjr lbV8DMw6RT8r2sJx+s3EI+havvlndHVmH9E4S2rEPW5qMPoynRwZMjBTEzFEVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=f92932149af5fd881ff68e372c4b72c9b28256f5 commit f92932149af5fd881ff68e372c4b72c9b28256f5 Author: Bjoern A. Zeeb AuthorDate: 2022-08-31 23:01:36 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-09-21 11:46:46 +0000 iwlwifi: move an ieee80211_get_tid() call Introduce a local change. It seems ieee80211_get_tid() does not deal with non-dataqos packets unlike net80211's ieee80211_gettid(). Gernally all calls in Linux drivers to ieee80211_get_tid() seem to be proceeded by an ieee80211_is_data_qos() check. Moving the ieee80211_get_tid() has no difference in the result, but (a) saves us the call if we do not need it due to an earlier return, and (b) allows us to put an assert into the LinuxKPI ieee80211_get_tid() implementation to avoid accidentally returning random frame header data in case of a missing earlier ieee80211_is_data_qos() check in (future/ other) drivers. Sponsored by: The FreeBSD Foundation (cherry picked from commit 26a36948331bd08d9afaddfc0da724eacdb953dd) --- sys/contrib/dev/iwlwifi/mvm/rxmq.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sys/contrib/dev/iwlwifi/mvm/rxmq.c b/sys/contrib/dev/iwlwifi/mvm/rxmq.c index 1e8a5611b9f2..7325e9d44273 100644 --- a/sys/contrib/dev/iwlwifi/mvm/rxmq.c +++ b/sys/contrib/dev/iwlwifi/mvm/rxmq.c @@ -963,7 +963,11 @@ static bool iwl_mvm_reorder(struct iwl_mvm *mvm, bool amsdu = desc->mac_flags2 & IWL_RX_MPDU_MFLG2_AMSDU; bool last_subframe = desc->amsdu_info & IWL_RX_MPDU_AMSDU_LAST_SUBFRAME; +#if defined(__linux__) u8 tid = ieee80211_get_tid(hdr); +#elif defined(__FreeBSD__) + u8 tid; +#endif u8 sub_frame_idx = desc->amsdu_info & IWL_RX_MPDU_AMSDU_SUBFRAME_IDX_MASK; struct iwl_mvm_reorder_buf_entry *entries; @@ -1008,6 +1012,9 @@ static bool iwl_mvm_reorder(struct iwl_mvm *mvm, return false; } +#if defined(__FreeBSD__) + tid = ieee80211_get_tid(hdr); +#endif if (WARN(tid != baid_data->tid || mvm_sta->sta_id != baid_data->sta_id, "baid 0x%x is mapped to sta:%d tid:%d, but was received for sta:%d tid:%d\n", baid, baid_data->sta_id, baid_data->tid, mvm_sta->sta_id,