From nobody Fri Jun 03 17:19:28 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 044F01BDA7F8; Fri, 3 Jun 2022 17:19:30 +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 4LF8kn4hrcz4XXB; Fri, 3 Jun 2022 17:19:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654276769; 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=P9htLOUYd53YxXbK/7V01Pc3F74Ni1hMS1Jummjc2jo=; b=Nzjde7fr/Evi5EKyaSGVKtfA88lbBkevF2B3eAA+kOhB8UBdRgAdv8hs2fJweGwn/SCM2H FdVhNkV7WJZAgzXk8KfMVdgky+meR6AdpGYyng44HCdcy+3FVvAa1dx9ouG1rwFDpT9Ewf Xq1cMICM2eF1rH+0rLCcRUPafFaQimVst5kbQokkjCO7AQ+bRqSxfmapdv4XMpRyctBOMh vuVT4BHCvbdmoKAIOPcETomcfqCiu0G8ZTP+ZHhqUxPjTHAzj+euOakIKgmm/H776Yx82r SZu/ebCAwxwsjOK2P3QzFmjt86hUokt/nsVYL2XXxjmophsvIIE0alyXbqyBEQ== 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 3B2FC537F; Fri, 3 Jun 2022 17:19: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 253HJSjT065801; Fri, 3 Jun 2022 17:19:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 253HJSC8065800; Fri, 3 Jun 2022 17:19:28 GMT (envelope-from git) Date: Fri, 3 Jun 2022 17:19:28 GMT Message-Id: <202206031719.253HJSC8065800@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: 26526bf1715d - stable/13 - LinuxKPI: 802.11 updates 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 26526bf1715d782eeae44ecd56da5b30475bdfda Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654276769; 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=P9htLOUYd53YxXbK/7V01Pc3F74Ni1hMS1Jummjc2jo=; b=T3W5PWKeKrSQ/rWwbrXdQ7zDBQbKetP8HOhTh3CUp8i2IcUMmEIT2E/lHZ9qWUScaM9oYZ PS/Sd10T2ztN03mjO7mHsaVL9bUiuKgx9UaHB4j0/xCKmF3AhQD3v5gFaL9qv/xbf7C+ZU LATXYiX/xKmWplxr0fbOs57/TofXsUccLIPm2CJ1XYP4FFqHOvc5dlu9Mf6tMYxspUEu+L E/DVnIcmd3HfPVMquTelNK74rms5I8rEUDW7FACxfO0mT8YgYDrURSookSkAo34CYAeLrf WRlAN1Nd+xCyebPguwNQM5ieaXxbhHA/htN3P2/GClOzsaqjFYJOIjIpfcSu9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654276769; a=rsa-sha256; cv=none; b=CaRVIRAFUGEYlbZGyB+atnhW2X4RbFmH68yAj4mwZN4Ce3TwRigcKUBL38oCh9Q/Yzn4rO gyNzQz7wYX2uaNm8TXSkRAQqAiRDEpAzD0gsJs8q8LXj8igy8K0+lftgF4KUn4nHXsZT9Q /vrpB/OxsNwpqaLZXsjyyXBUoTeErz6eGYb4FpzC8JjIojKzJdU5x3ljkitKFQdNZuNU9M qz+6HFxVHXyquz7raYus3nCvO3d4Gc1pSsbJ4zHLsziScbNiYPETn/+LbX1S3DJeMA9vfK rDj49eguJIn6QVQ8V7gIdDqep7B8ayoAcBQkBfml0aSfFLapU6HwSzEkBIyfKA== 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=26526bf1715d782eeae44ecd56da5b30475bdfda commit 26526bf1715d782eeae44ecd56da5b30475bdfda Author: Bjoern A. Zeeb AuthorDate: 2022-05-18 22:39:57 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-06-03 16:56:56 +0000 LinuxKPI: 802.11 updates Add more values to the ieee80211_min_mpdu_start_spacing enum with two missing given we do not know how they are called. Also update the reference while here. Add struct ieee80211_hdr_3addr and correct the comment on the ieee80211_hdr to match the one in net80211 to avoid future confusion. Sponsored by: The FreeBSD Foundation (cherry picked from commit d296b65d899249da24a8b277554df4af93357b36) --- sys/compat/linuxkpi/common/include/linux/ieee80211.h | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/ieee80211.h b/sys/compat/linuxkpi/common/include/linux/ieee80211.h index e0aa558fe273..c131a6c69495 100644 --- a/sys/compat/linuxkpi/common/include/linux/ieee80211.h +++ b/sys/compat/linuxkpi/common/include/linux/ieee80211.h @@ -130,9 +130,15 @@ enum wlan_ht_cap_sm_ps { #define WLAN_KEY_LEN_CCMP 16 #define WLAN_KEY_LEN_GCMP_256 32 -/* 9.4.2.56.3, Table 9-163 Subfields of the A-MPDU Parameters field */ +/* 802.11-2020, 9.4.2.55.3, Table 9-185 Subfields of the A-MPDU Parameters field */ enum ieee80211_min_mpdu_start_spacing { IEEE80211_HT_MPDU_DENSITY_NONE = 0, +#if 0 + IEEE80211_HT_MPDU_DENSITY_XXX = 1, /* 1/4 us */ + IEEE80211_HT_MPDU_DENSITY_YYY = 2, /* 1/2 us */ +#endif + IEEE80211_HT_MPDU_DENSITY_1 = 3, /* 1 us */ + IEEE80211_HT_MPDU_DENSITY_2 = 4, /* 2 us */ IEEE80211_HT_MPDU_DENSITY_4 = 5, /* 4us */ IEEE80211_HT_MPDU_DENSITY_8 = 6, /* 8us */ IEEE80211_HT_MPDU_DENSITY_16 = 7, /* 16us */ @@ -350,7 +356,7 @@ enum ieee80211_tx_rate_flags { #define IEEE80211_HT_CTL_LEN 4 -struct ieee80211_hdr { /* net80211::ieee80211_frame */ +struct ieee80211_hdr { /* net80211::ieee80211_frame_addr4 */ __le16 frame_control; __le16 duration_id; uint8_t addr1[ETH_ALEN]; @@ -360,6 +366,15 @@ struct ieee80211_hdr { /* net80211::ieee80211_frame */ uint8_t addr4[ETH_ALEN]; }; +struct ieee80211_hdr_3addr { /* net80211::ieee80211_frame */ + __le16 frame_control; + __le16 duration_id; + uint8_t addr1[ETH_ALEN]; + uint8_t addr2[ETH_ALEN]; + uint8_t addr3[ETH_ALEN]; + __le16 seq_ctrl; +}; + struct ieee80211_vendor_ie { };