From nobody Wed Sep 21 17:16:12 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 4MXlSD6mRMz4d3GT; Wed, 21 Sep 2022 17:16:12 +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 4MXlSD6Fhsz3T2G; Wed, 21 Sep 2022 17:16:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663780572; 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=Scodh3nnWdREakejBgil7Sr8D7JdJEk4f/aL2dW6Fw0=; b=Y4qzo1Y6M/7OYjLHmiEtgvqmtIYeN/08g0NpjlQqTg4sCHgKYEPOybb02Pt1Wzz25NIoms bmXHd27dIbryffOlSTIJ9bPe6NPqktLGuRaM2ttrdr0hjSlkeK1brUcaPtEwOxUYXI6yaM z2h16cPI5bi+kh7li4yqeQ5qzJ2sWBJKOmsOfvSUMXSgRn/J06MJHRXjBArwXjV135ciiv fzBY28sdVB2Q+h/RYzZofF00sJmEhDPkG+YtrfF4Y7bmQyjQ0wd/o8EYKJpy38LY6nqMHS di2b+5ydmtpdcrSCtNUc5Opu98Mb9lnZE5++Bl92jTWKPplMTLZKknwhSEtlww== 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 4MXlSD5Bg2z17Hf; Wed, 21 Sep 2022 17:16:12 +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 28LHGCNI038728; Wed, 21 Sep 2022 17:16:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28LHGCE4038727; Wed, 21 Sep 2022 17:16:12 GMT (envelope-from git) Date: Wed, 21 Sep 2022 17:16:12 GMT Message-Id: <202209211716.28LHGCE4038727@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: f02e21159b2e - main - LinuxKPI: 802.11: add more header compat bits 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: f02e21159b2e7ab0d75905742f74ae5798bea122 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663780572; 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=Scodh3nnWdREakejBgil7Sr8D7JdJEk4f/aL2dW6Fw0=; b=Q8IaKLjBHB+pMpH52mVyyhCYO3+++xvsU5YzorSW7xSFqsTGpK6LCsQ5rmpvY4nkRTfrd+ 1zq4WAX/MMj8pTZW2HZTfYAOfBBLhwA/eLPoPeCUwiv9xIo4qjFbiVVELUlxJBvPKTtntN gt7+40R9/ngcf1Y700Ft0UIJfXrJzbcfmPa2UZkeyDiH7qotv67i1Dtf+MPWsISTjAlfyz UJSm3OkemogPQW5ezVmfKGChES3GtYu06JXkDumBouOk+AVbJ2L4ctgZNAyTAB17L+8YyH NM4TSSVqeGhokYfdEBEcpsminqkPf+dSPCjWuj6b9kL/bBjqYpSdAAYw9E15nA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663780572; a=rsa-sha256; cv=none; b=MsGQz2clCca/WH5Ag0Ba/T2RvEE+Q6J6Mwc7OrEc5uvpLOn3CDkU3PdqcyRZf23A2w3UuM L9oi+4IdlcODNUy2xQ2hCwBz9wwsOA6VCbK82AeYM+PS8Io5FyUwknldSaiM/xvYBjGqk3 ywQO1NsJ3VV7HzUpPDcHgtlhur0R01pNXkhMHUElwnm1st9J4HnB3c2NwF7V/9Zi+Z4sHK DQQwlOiEivkvClCyOwH7H4OJVlmUAkOfVNnRENxDcH7YWcgFTZ5ntjawt+GLJ7KVQPTBAT k5H7SHfS/mewH0ACwzwiBCUzxu7BvE+hkkLXyLbglwEDNKgJFcvnn5oF9rAKBw== 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=f02e21159b2e7ab0d75905742f74ae5798bea122 commit f02e21159b2e7ab0d75905742f74ae5798bea122 Author: Bjoern A. Zeeb AuthorDate: 2022-09-21 17:12:48 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-09-21 17:12:48 +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. MFC after: 3 days --- 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)