From nobody Fri May 20 01:12:39 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 F273E1AE6AC1; Fri, 20 May 2022 01:12:39 +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 4L47xg6KTPz4SQY; Fri, 20 May 2022 01:12:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653009159; 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=iq/8VVsgmN4y+TK6xM7BhsPixSHh93eG5niho0Z8ZuA=; b=Q5UmgkxjdCH5ddSQ0oNvM63o44VWIi6t/yb6zVw+hIjCtevuOx2oMmTXDgjQuk6fz5x+Ty i5z6TYq3uLPRgeohTkRb9XCSTeAzn27+OVlnpyDFUR9nuQY3Ed9QZsMCpFXSK61zyy08xY +2T9puz2/QFrKKjzk+Rq77uWKQyk+paGUEBeSXVsCytFKgK0ET7txwmSN//d7iiy/czmxu ZnAfPScfqUO151mRweTcQ3ueYXfWDfrsHZo67bCWiNafe71oAKGTXYqMkLhJDKn5nm95Z5 F0ceGHjr4N4GfMzcTioNxyWXKhg5e6RFd3nSWD9buYiC837/mjQh38oiJLBF3w== 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 B9D87C84; Fri, 20 May 2022 01:12:39 +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 24K1CdMU045842; Fri, 20 May 2022 01:12:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24K1Cdu6045841; Fri, 20 May 2022 01:12:39 GMT (envelope-from git) Date: Fri, 20 May 2022 01:12:39 GMT Message-Id: <202205200112.24K1Cdu6045841@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: d296b65d8992 - main - 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/main X-Git-Reftype: branch X-Git-Commit: d296b65d899249da24a8b277554df4af93357b36 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653009159; 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=iq/8VVsgmN4y+TK6xM7BhsPixSHh93eG5niho0Z8ZuA=; b=i2c2VRiK5OdjOlOU6xUnOs5Eu2LASPsCXdW56OxKoXJIOXX7imL7ulXQ7sovL2h+WVQ3Bj EMLxYrsUeYIvJNb6B20m0SiV6HHdVPhgSb7a9A2WLtOu6ypTIi4CK3a4nA333EVeIR6/ha 2KPjfNcPvdwhqd5AyI1pv8SxTklnfOkPWej9oqbQjkxWz2K7qAzBRMYdCxGfIt9yPUwkOa KFEd3USNj8ONULU3uo5pykj2xGp5McyqwDVoZHmQG/iGLmITlmcSWnspAZhZNT2svvLClV puaIWOR17a2vK4s2Z8qQtHCTz2f5KCQeYMlWF+WU5LHKkK+Izvt91SoGTA1GaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653009159; a=rsa-sha256; cv=none; b=vpu1lpCLqLa99C7kAkpVHsaaZ2ywKHMbyqI4vqpOeYLGGM79Zazk93vhC3SNmt0PBkXyfN bDvaZxZuxcNPB+qKeP7qA499jdvpbeF6aqsKUsJamc3M2P7QJV++V5xJfXRo8xHWxjRHSy JoF2Wx95dXZWQuJ3MTbd1glodlQ9/NvmKQrTxgiyTyi0S4yNM4tHzhJfKpvxUF1w5rzvk2 faS7WMixJ9BmdB3Pu9wP/6K9a93kCiHOqUmcBCfT6blbgdEfZ55wyiZj16LhdymnsKLqel bwXs5Cp3NH2HDSMv03ououszMKQbRXE7MxCIhTqQM0rjeMgdlmi1B/h0HkkDbg== 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=d296b65d899249da24a8b277554df4af93357b36 commit d296b65d899249da24a8b277554df4af93357b36 Author: Bjoern A. Zeeb AuthorDate: 2022-05-18 22:39:57 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-05-20 01:11:22 +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 MFC after: 3 days --- 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 { };