From nobody Mon Oct 17 20:41:26 2022 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 4Mrpn30mD7z4fQs9; Mon, 17 Oct 2022 20:41:27 +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 4Mrpn3099fz45Rl; Mon, 17 Oct 2022 20:41:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666039287; 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=9kFQxzqiRHPgWaD0mi2zlGPFtyxYpmL59/rKhTi4+LA=; b=PCPNib+Nk9gurhj1BgTZKHKMVz10wrxgkkmVYGEytSoy1UahUotiuJ2YM9XCEhxQpIncYg f/LMIDRvqdWZ86YQJo3LZ9yLvDiDrNoD1n2O3+C9PYLzgNQI2oBvGflwIVi58djMHe1lzR jYwSl7MNw4abl0sWyE7SrLygYYKm+hXCA6piYEhCfuWmOIqxFGYUZsi4nDaTkBjIroZv/u KgBrGTPCK71WJiv2sn64VpLv8ewM5DgFpj3vyDSs+hg8WYFM4iZy4FWEJkE3QAUVgeyhRZ yuKdHDr0p08vAzSgDRIxVc7zZSvV+h7GnhcjNTJV4aNkDyZtXEa+bN0RO+1Q3g== 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 4Mrpn26NJ4zx5l; Mon, 17 Oct 2022 20:41:26 +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 29HKfQla096260; Mon, 17 Oct 2022 20:41:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29HKfQwY096259; Mon, 17 Oct 2022 20:41:26 GMT (envelope-from git) Date: Mon, 17 Oct 2022 20:41:26 GMT Message-Id: <202210172041.29HKfQwY096259@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: 9a7cd8c9c346 - stable/13 - LinuxKPI: 802.11: add more header compat bits 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 9a7cd8c9c346b9056358f7e843a4650b4e616f39 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666039287; 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=9kFQxzqiRHPgWaD0mi2zlGPFtyxYpmL59/rKhTi4+LA=; b=Msal+hxC7iHWMCEkFd80kIHN+v3NC3/2zY6+W/XhAIaLt3+vKE8m6akTP5BXKkh2hBa7k1 IjjihqIIUZz6Ya+GARau721Am76CCBNdlvwSqou4/E/jccRrcawYKMAoIU5K6HN0ZBeGLe rPDvOpNzmaNg+gZWVUv31XqgID6rcPFvVgThcQfLLKscdbM8hqa+dC9cI9Ykl4GzcuN0xZ /awuDeGL36XxKAybelOfD0nghlZP6Td8dERjUG4DaiMcxqcUwYoItN5MwIx75EO6nlx4Qw 4383P0zrIAT+rufbIgLTmZcnXJzRew2OkUUNh2l+ER+XBjRGMemTSXDBQ4hLBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666039287; a=rsa-sha256; cv=none; b=pu/CuGzK57PrygAcxvfIeMm3HeIo5Lh0vDX2draTw4YknuPFuoVBCycjPERCJT784JV+/Q YwjMdgopbCe0EBxPrYeg7Sz+YKWFKQYcuwxIWSBSy5fg8PQHXt52uuKJJQen3zY26uLl7e JHroP2XFQQnfWeUsUeyejDSabG1vR/R5oIITK082x0zqC6mE0uG3nIfBJpE4h0MWcVlUCM TP7+331rp+7SByLg4sPEDzAoYV+QHwezlvLicsjcFHCOJelIC+FpYT5Wx7bsXjiAlSHXFx Fg0wYqydMdDiEg1btb9/t/SsQtcNglf3POZ/KyynG3X2H6T9+QcOaqL4lharNg== 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=9a7cd8c9c346b9056358f7e843a4650b4e616f39 commit 9a7cd8c9c346b9056358f7e843a4650b4e616f39 Author: Bjoern A. Zeeb AuthorDate: 2022-09-21 17:12:48 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-10-17 20:37:02 +0000 LinuxKPI: 802.11: add more header compat bits First part adding more bits in order to synch up drivers to the same level and enable a new ones. (cherry picked from commit f02e21159b2e7ab0d75905742f74ae5798bea122) --- sys/compat/linuxkpi/common/include/linux/ieee80211.h | 10 ++++++++++ sys/compat/linuxkpi/common/include/linux/nl80211.h | 7 +++++++ sys/compat/linuxkpi/common/include/net/cfg80211.h | 7 +++++++ sys/compat/linuxkpi/common/include/net/mac80211.h | 9 +++++++++ 4 files changed, 33 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/ieee80211.h b/sys/compat/linuxkpi/common/include/linux/ieee80211.h index 9c65b4045cbe..5a29137d0510 100644 --- a/sys/compat/linuxkpi/common/include/linux/ieee80211.h +++ b/sys/compat/linuxkpi/common/include/linux/ieee80211.h @@ -424,6 +424,16 @@ struct ieee80211_hdr_3addr { /* net80211::ieee80211_frame */ __le16 seq_ctrl; }; +struct ieee80211_qos_hdr { /* net80211:ieee80211_qosframe */ + __le16 frame_control; + __le16 duration_id; + uint8_t addr1[ETH_ALEN]; + uint8_t addr2[ETH_ALEN]; + uint8_t addr3[ETH_ALEN]; + __le16 seq_ctrl; + __le16 qos_ctrl; +}; + struct ieee80211_vendor_ie { }; diff --git a/sys/compat/linuxkpi/common/include/linux/nl80211.h b/sys/compat/linuxkpi/common/include/linux/nl80211.h index c4c46fbd90cb..f8de2eedf1b7 100644 --- a/sys/compat/linuxkpi/common/include/linux/nl80211.h +++ b/sys/compat/linuxkpi/common/include/linux/nl80211.h @@ -321,6 +321,12 @@ enum nl80211_he_gi { NL80211_RATE_INFO_HE_GI_3_2, }; +enum nl80211_he_ltf { + NL80211_RATE_INFO_HE_1XLTF, + NL80211_RATE_INFO_HE_2XLTF, + NL80211_RATE_INFO_HE_4XLTF, +}; + enum nl80211_dfs_regions { NL80211_DFS_UNSET, NL80211_DFS_FCC, @@ -333,6 +339,7 @@ enum nl80211_sar_type { }; #define NL80211_VHT_NSS_MAX 8 +#define NL80211_HE_NSS_MAX 8 enum nl80211_tid_cfg_attr { NL80211_TID_CONFIG_ATTR_NOACK, diff --git a/sys/compat/linuxkpi/common/include/net/cfg80211.h b/sys/compat/linuxkpi/common/include/net/cfg80211.h index 89b7af916573..7995f633256f 100644 --- a/sys/compat/linuxkpi/common/include/net/cfg80211.h +++ b/sys/compat/linuxkpi/common/include/net/cfg80211.h @@ -576,6 +576,7 @@ struct mac_address { struct ieee80211_reg_rule { /* TODO FIXME */ uint32_t flags; + int dfs_cac_ms; struct freq_range { int start_freq_khz; int end_freq_khz; @@ -787,6 +788,12 @@ struct cfg80211_he_bss_color { struct ieee80211_he_obss_pd { bool enable; + uint8_t min_offset; + uint8_t max_offset; + uint8_t non_srg_max_offset; + uint8_t bss_color_bitmap; + uint8_t partial_bssid_bitmap; + uint8_t sr_ctrl; }; struct ieee80211_sta_he_6ghz_capa { diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h index 33379900b625..1dfc4d7506f6 100644 --- a/sys/compat/linuxkpi/common/include/net/mac80211.h +++ b/sys/compat/linuxkpi/common/include/net/mac80211.h @@ -809,6 +809,8 @@ struct ieee80211_low_level_stats { enum ieee80211_offload_flags { IEEE80211_OFFLOAD_ENCAP_4ADDR, + IEEE80211_OFFLOAD_ENCAP_ENABLED, + IEEE80211_OFFLOAD_DECAP_ENABLED, }; struct ieee80211_ops { @@ -2429,6 +2431,13 @@ ieee80211_report_wowlan_wakeup(struct ieee80211_vif *vif, return; } +static __inline void +ieeee80211_obss_color_collision_notify(struct ieee80211_vif *vif, + uint64_t obss_color_bitmap) +{ + TODO(); +} + #define ieee80211_send_bar(_v, _r, _t, _s) \ linuxkpi_ieee80211_send_bar(_v, _r, _t, _s)