From nobody Sat Apr 30 08:03:29 2022 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 B2E371ABD775; Sat, 30 Apr 2022 08:03: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 4Kr20x3YCyz4Z9c; Sat, 30 Apr 2022 08:03:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651305809; 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=2vEo7ug+BNQqxfGfr1evr/BN6f++k/ooDb0p6jAmO5Q=; b=UqAtf0bkoveoesLPltQgtuHqUb7ar03W4No+DDrZ94dIGgnapKVHj61aQpVFeRxFjyOve7 FDKkDiq8Hy8R6KIDLFH4y3J8b+wYc8pdeJ7jwOvV/zhSXFE5SEibBNtebxqOPCmKcWwXIA 9zHrksgTnkBuPLgZH+neE7g+0CjxnEinMuQEooMVpcujTjI5JohFuMvdSvXOZdHLRCbbsV Oi/MYUIg0MaTO0VxIy/X38LvQnN42qU7djmsjgJZsDCzr68eg5y709uhFk7RrKPRGdVI4I tbjwT4CjuNd8FOWZujDXjbzymGmyfr+GRyHQnXf9T+xVAOpOEZpibwbUUptwbw== 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 262411D5B7; Sat, 30 Apr 2022 08:03:29 +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 23U83Tpl058038; Sat, 30 Apr 2022 08:03:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23U83TOB058037; Sat, 30 Apr 2022 08:03:29 GMT (envelope-from git) Date: Sat, 30 Apr 2022 08:03:29 GMT Message-Id: <202204300803.23U83TOB058037@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: 00614c9c2ddc - main - LinuxKPI: 802.11: fill in two more TODOs 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 00614c9c2ddc34f3f9061e87542efb4edbd936a9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651305809; 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=2vEo7ug+BNQqxfGfr1evr/BN6f++k/ooDb0p6jAmO5Q=; b=PBy/A08OmpiV9wtPl4tPm2vp60Vrgu4pYBty+9gkEJ+psYbb2ZsOEkGoryvTwuAshIUxmj aw0g8xeNk3kxVlYSsuB9Wxeg5d2cr8HMic4bosm2/W0Z6GVmkaMr9uVhfWGL37g1j+eWpR OZjcvvf66o0pIuD5qQAmwWNdHbnIloi36MCNxqVCbod2aCG5WmjJ/Y+v7XXFgl3Pe14Mp/ xPXbLeaebNHSir6k8l87x2eyzHrd8nmVv1Omv2yBnXZD18fX8QCJHLHAuWVdlx37jOYoAZ hklvao9YUuBqXIu1nzHkBIrgtxhEdG5S+j7/unOWpuzHlfWb57l0lkJn5QFZAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651305809; a=rsa-sha256; cv=none; b=UGVznaC4yJmz6BKGvZ9N91xHXv+s96kO1V7rtiu5bO5Lh1TPrEswtSWNvDpZ797AtckPlj kCQR285d8sIXih37ZKU9RLLXeMVdwvgNXn0RIbnr77+o46iLYTSAd5IVV7DC3TW1GQQp8i bXoGcn3Nk4D2X8CQdjNSN/njJSJM25gzAGq7AK6cKlkHSI+mBlbCJVuNwu2d13Vxt3kzhV QmQ6Vbyp2byfN6MjWLJxNMSPBBT2YuW2ToBhzeuK35e7cwgxYJjH4/GBYUW0S81CE2S38R VYyprdZITIvxKYfJ+wLtzbLvwX2Jxfxki3KiNnn7WVD4VJmqyITZZpcJsQbchg== 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=00614c9c2ddc34f3f9061e87542efb4edbd936a9 commit 00614c9c2ddc34f3f9061e87542efb4edbd936a9 Author: Bjoern A. Zeeb AuthorDate: 2022-04-30 08:00:04 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-04-30 08:00:04 +0000 LinuxKPI: 802.11: fill in two more TODOs Implement ieee80211_is_data_present() and a subset of ieee80211_is_bufferable_mmpdu() which hopefully is good enough in the compat code for now. This is partly in preparation for some TXQ changes coming up soon. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/compat/linuxkpi/common/include/net/mac80211.h | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h index b1ce4c2ff2b9..7a8306919194 100644 --- a/sys/compat/linuxkpi/common/include/net/mac80211.h +++ b/sys/compat/linuxkpi/common/include/net/mac80211.h @@ -1102,8 +1102,13 @@ ieee80211_is_disassoc(__le16 fc) static __inline bool ieee80211_is_data_present(__le16 fc) { - TODO(); - return (false); + __le16 v; + + /* If it is a data frame and NODATA is not present. */ + fc &= htole16(IEEE80211_FC0_TYPE_MASK | IEEE80211_FC0_SUBTYPE_NODATA); + v = htole16(IEEE80211_FC0_TYPE_DATA); + + return (fc == v); } static __inline bool @@ -1166,7 +1171,19 @@ ieee80211_is_back_req(__le16 fc) static __inline bool ieee80211_is_bufferable_mmpdu(__le16 fc) { - TODO(); + + /* 11.2.2 Bufferable MMPDUs, 80211-2020. */ + /* XXX we do not care about IBSS yet. */ + + if (!ieee80211_is_mgmt(fc)) + return (false); + if (ieee80211_is_action(fc)) /* XXX FTM? */ + return (true); + if (ieee80211_is_disassoc(fc)) + return (true); + if (ieee80211_is_deauth(fc)) + return (true); + return (false); }