From nobody Wed Aug 31 23:09:21 2022 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 4MJ0HQ0px8z4bbxc; Wed, 31 Aug 2022 23:09:22 +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 4MJ0HQ0H5Mz3pck; Wed, 31 Aug 2022 23:09:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661987362; 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=uE+lfNHh9IgVN/P8DnEDVzyVBUf6FhnmfhmAXG1jKeY=; b=M4Qazx4vfTEQU8fR9TbGnPtnTa1REbLo38avlPUXIURA/K3yYrziuXS5dEeBSJPIrZC/y6 neJ5FKZBu6KsOu8Xht77wpXAsxcudwtHJg+UtEEDS3ygX8IzX1R8w18g9YQf+Q9m18/AKt IciPzVtjgmtUxeE+bkg/OdtryunAD6g320K2XuMjuDqjr9VerIpLD91EqftwimfUekux9E PTYuW3C9gP0uoiJUu5e24LLEPkASrCEiGJBQbPCRsoL+VPhJMVE1JfR5DLWLZ3UUzg6ZUo 9K9rrRoeCj1xUdL8b3m2XVZB0j2xnezI4dro43BYPUxwjhsILDN9gJk33SqC3w== 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 4MJ0HP6VX0zHCw; Wed, 31 Aug 2022 23:09:21 +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 27VN9LNP054492; Wed, 31 Aug 2022 23:09:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27VN9LfM054491; Wed, 31 Aug 2022 23:09:21 GMT (envelope-from git) Date: Wed, 31 Aug 2022 23:09:21 GMT Message-Id: <202208312309.27VN9LfM054491@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: 26a36948331b - main - iwlwifi: move an ieee80211_get_tid() call 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/main X-Git-Reftype: branch X-Git-Commit: 26a36948331bd08d9afaddfc0da724eacdb953dd Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661987362; 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=uE+lfNHh9IgVN/P8DnEDVzyVBUf6FhnmfhmAXG1jKeY=; b=Fvu0rWmCT0kpeRGWkgULjetmUbSqaGQstTmTSoS8eoOc5JzIgVeqBjEF53JuJCv22acezz 7JatL2YoF/mDvGCAB4sOr3buYAt6x30gQyQy4lCGQRPGo2D8x5f2eRvhmxzb1nfRgfMBaW NoX+CA6iZpRExj9p7xA2qavVeHYssxuLo9lhGl5V71Sn4FwBkCStNdOHrOzmqxxWhJuMXx sE+qnvPMq/ZdDadkZf6JJTEg/dfWm4OTjVMiPGxodUnv9vOC/GpOGeqcoZ2bHfAMVgExRA tq7yHE+it7l+vPEu6jliy+GyxkxFLBvMU/Rsya1qQleix00273IU5dutVY01Zw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661987362; a=rsa-sha256; cv=none; b=QD8HtD73+6ioxq3jWrtYmCY9cHwP1eijFm0Crpb1A5QSoDyIdwHNzL+19dH09luMM5Eyb+ Lwh3ZFoy0qTD3bizKfj6to7maFy9Vok/3q69XVYlkPcd2Fo+P0ra6yLPmhu2Mpj+qKxg/a HMgabYL1OZgjR55tWx773lWunvm99LSgaLnJhtdlTma5BGE+vSl+JHyV2XIenbAuQZD/Mg 7GyB1Qc3FYIgPjYSTRfRr9aLlmHZCN+eSdS54aTo6ccMB5ilviaFu6S7lvolAKtuKCyyFE Z82MnXF33uVtiKrm+g2WA1eyjxkGijESjqihvTs8SRmN6pc6mv72/C3Z0/DQwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=26a36948331bd08d9afaddfc0da724eacdb953dd commit 26a36948331bd08d9afaddfc0da724eacdb953dd Author: Bjoern A. Zeeb AuthorDate: 2022-08-31 23:01:36 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-08-31 23:01:36 +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 MFC after: 3 days --- 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,