From nobody Thu Feb 23 19:34:34 2023 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 4PN3BL5BvDz3sfQS; Thu, 23 Feb 2023 19:34:34 +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 4PN3BL2d5dz45Zv; Thu, 23 Feb 2023 19:34:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677180874; 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=mtrRnnLcEH/W08BuW/KZ2micN1gIDbPwQL7SRfArUis=; b=wIhEFmoqPyBpkpmzuCI+cSFaI49VzH3V/W1bHZy3zuBABaCZg3Vk2ovuKN4PL7PY922fds HuD8PwfIAg6SqH+stSPSFIMo2BUb0u3akj0jXyQ8f1Ai0cF866mfr73jIEi2kFM+xkIs/b a3qPUWH+scDUzY79f0NCSfHimJ7U9uhuwiFsZ/hXRdVENNgHIgFip0jg+bHE8n5MCVwihj ugwxLLcG7Sh3oErsJXanPocFogr5Zm59kA2tpN98iGfpGya49fFMwIiP0xTuA4xAwRQcje Bzsxi2e3Z9PqRWBu4xdjBY5sbE0lMNMQA8lFostNRHVhsMUPizpEPXZMZ5Wcow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677180874; 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=mtrRnnLcEH/W08BuW/KZ2micN1gIDbPwQL7SRfArUis=; b=VTpfKTDpw9VMEaYKJY46Nw/d4I3Gr+8gd3IYsqoz/dWc1PSMhEVcrq/5WK8rxUDWODyUwP VDq5fnFMrnypGP2LBR28LNDbr+Wo+e/xq8o68H1mscgmkHUUtLxNiXaCdmUIEPhGvXDw19 66uLeed3QFtOhauXz1kVZjwf3A+1TFTk+4cqiI9Q3rwuYjmUdNu6DzUhGHExr5YaueW8NX rWmgd3yxkwIWpfD437Ey5yJKKUGqB+pmIGxSqvwCfAiCAjCQYSjd/8uscpOU++361RqR7y Pg9hbriHkRv2hUvPF03qxPucQ5gaDm4/bVAHnaro7g4YMe/nvwE6lglY2xrwiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677180874; a=rsa-sha256; cv=none; b=mVTKzt/2wk1bAEdCE9E5KjtRpeQIo9OxVDmu6yHLj7cPBOHllVeAgLVi3SrajUhempK/xV +ag3BdNCsRrZrtTlRPf1sCypmMbObFL32usvjHKogpC+cio5RlfZl0Tu4joFZL2pjeLS/K DoyzYeK2Xke98hSqbrjXpR257uevuI1FUR0JdEQlrOvGx3VrXh1K63gwgqdnNNZCv7P5U4 QuvZAtJzV+yc6zlDBwhsbrbiaUG3tC/rSSUcSSV0HKL1tz87+OIyaDQqRNj2aHaZnvSEoj WerXBuH9Kh7zZDEp3qJn2Kr7rpR9qyZzJ0PSFmX8NPJ+3xckVO39ECghNfPT4w== 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 4PN3BL1MGXzvLZ; Thu, 23 Feb 2023 19:34:34 +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 31NJYYqL020336; Thu, 23 Feb 2023 19:34:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31NJYYV7020335; Thu, 23 Feb 2023 19:34:34 GMT (envelope-from git) Date: Thu, 23 Feb 2023 19:34:34 GMT Message-Id: <202302231934.31NJYYV7020335@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: 811e79336e96 - releng/13.2 - LinuxKPI: 802.11: implement ieee80211_is_pspoll() 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/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 811e79336e963ada4db550e40def2d77b6753f8a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=811e79336e963ada4db550e40def2d77b6753f8a commit 811e79336e963ada4db550e40def2d77b6753f8a Author: Bjoern A. Zeeb AuthorDate: 2023-01-31 16:36:24 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-02-23 19:32:41 +0000 LinuxKPI: 802.11: implement ieee80211_is_pspoll() Implement ieee80211_is_pspoll() and move it up to the set of implemented ieee80211_is_*() functions. There are no further changes (git diff just looks weird). Sponsored by: The FreeBSD Foundation Approved by: re (cperciva) (cherry picked from commit ff76cbc81d57ffc4bbc9bc20fd22325b2a8c2028) (cherry picked from commit 2336248a8ba9763ad38074db40f32e117edd86f5) (cherry picked from commit 16dc23caf17f8ffa21e365a1f2fe1a72d7fecbe8) --- sys/compat/linuxkpi/common/include/net/mac80211.h | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h index 2b3f6b8e3ab1..b7c6c2d37b90 100644 --- a/sys/compat/linuxkpi/common/include/net/mac80211.h +++ b/sys/compat/linuxkpi/common/include/net/mac80211.h @@ -1342,29 +1342,33 @@ ieee80211_is_any_nullfunc(__le16 fc) return (ieee80211_is_nullfunc(fc) || ieee80211_is_qos_nullfunc(fc)); } -static __inline bool -ieee80211_vif_is_mesh(struct ieee80211_vif *vif) +static inline bool +ieee80211_is_pspoll(__le16 fc) { - TODO(); - return (false); + __le16 v; + + fc &= htole16(IEEE80211_FC0_SUBTYPE_MASK | IEEE80211_FC0_TYPE_MASK); + v = htole16(IEEE80211_FC0_SUBTYPE_PS_POLL | IEEE80211_FC0_TYPE_CTL); + + return (fc == v); } static __inline bool -ieee80211_is_frag(struct ieee80211_hdr *hdr) +ieee80211_vif_is_mesh(struct ieee80211_vif *vif) { TODO(); return (false); } static __inline bool -ieee80211_is_first_frag(__le16 fc) +ieee80211_is_frag(struct ieee80211_hdr *hdr) { TODO(); return (false); } static __inline bool -ieee80211_is_pspoll(__le16 fc) +ieee80211_is_first_frag(__le16 fc) { TODO(); return (false);