From nobody Mon Nov 28 21:26:38 2022 X-Original-To: dev-commits-src-main@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 4NLdnp2XTKz4hyn6; Mon, 28 Nov 2022 21:26:38 +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 4NLdnp1wqDz3Qdf; Mon, 28 Nov 2022 21:26:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669670798; 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=7+D0OpWl4PfybxayPD5ADiB1HH3qotdQJr7+OUEbv3k=; b=n1Y/UWVlCRy4be0bTVnMwLWxniNM6l9JMM/FV5es7wyjnZAtdsGAXhQwqVbRDzlHA3ZAVs zhPc+SGVs0qsDaC6dj2sCpvj/oPpU9OKD+B8UVQbFANr5O0wWTuIb5Pf0Kk4GpILJ9Sc1H lbvFuACccHjo4zMgAH+Gh0eJMOqhe4uY7C1Ppg8x45Voa6Y8CduXg2bRu12IS/smKERvmM xF6qnC4Sh4DWG/DbBZYXk2gsxrryN1KRWXRujie5vHD//iiXbOq6UYIOXOITDN1SXOOmWC eTo/r/hLIs1LFJsFvgF7cZkrmUCcHZxhJmXjZWjvuFY8Bp8FSDMshzQGG8/Xng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669670798; 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=7+D0OpWl4PfybxayPD5ADiB1HH3qotdQJr7+OUEbv3k=; b=ChH5f4hS3NSMc1FumNvo+cmxVYsxKgmMBqrbtTLHpXZ493KZGFpGtFon+ZDC4X9G0KTD6y 5XhkBdZr4aCgaCFgx9yOCK5YXJLtz5va6wVsJTWkUIC9AAFWE+uIlGZfc23Q/Y9qG66HFf 6VYpq4Csg1WFmSYEuSe9e+RFT91fIvLvE0mSCK6UrQYGZ4M9ybhj+uvOegzkmKeh2BwwUf uSzGKQUcp6iD56LBBFF0ZMEHa4nPtoM/OSsKDG7QD4L1PtSuR4zspRXNG7d62362TrRFLP UkbvFYNKc3fSLNoFkJ2vFViOCqq1moru5Dbq2jjc5u5gW+DEfuDRr1cUxnWgaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669670798; a=rsa-sha256; cv=none; b=tt/KSQpQuNRcGIYOQ+aY9yVqdSi/lojf5hymKzZeCHVP5SKRZ+R4K24Z7pGRygWv1bst/g XloDBllrUAiGdZZdoPOphdLihMdkvJuTuL0f9B5Q40Li8Aikv+iIRaqwILU1YaMLvY2d7L YnqZi7lnZCko95sasC/6Rtpr/QbfPe95yYiaF0YrptCdk1F+AAsboeHmYZZ7vs6U4sjFFn rwpHI7WvyhTSjgdDP/XYKIO9Xt9V9zW/ktJg5R8hbRQlBRtqUh9rAxcDoHBXjJ85XBmksZ 3I+9Mg7/JpZGm5vcABLwXhaZpXci6+4ZpiK0tH/uuqrTkpmkTcqAbfcShHYvCw== 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 4NLdnp10NqzsWC; Mon, 28 Nov 2022 21:26:38 +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 2ASLQci1022733; Mon, 28 Nov 2022 21:26:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2ASLQcqu022732; Mon, 28 Nov 2022 21:26:38 GMT (envelope-from git) Date: Mon, 28 Nov 2022 21:26:38 GMT Message-Id: <202211282126.2ASLQcqu022732@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: 69cc1630014b - main - LinuxKPI: 802.11: minor header updates List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 69cc1630014b7c50f754f5d49cfd4ed2905a5c48 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=69cc1630014b7c50f754f5d49cfd4ed2905a5c48 commit 69cc1630014b7c50f754f5d49cfd4ed2905a5c48 Author: Bjoern A. Zeeb AuthorDate: 2022-11-28 21:21:06 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-11-28 21:21:06 +0000 LinuxKPI: 802.11: minor header updates - add comments for enum values constantly looked up, and another one to a net80211 equivalent (should possibly re-define those in the future?) - add another nl80211_sta_info flag - add enum environment_cap used in cfg80211.h in the future. MFC after: 3 days --- sys/compat/linuxkpi/common/include/linux/ieee80211.h | 12 ++++++------ sys/compat/linuxkpi/common/include/linux/nl80211.h | 1 + sys/compat/linuxkpi/common/include/net/regulatory.h | 4 ++++ 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/ieee80211.h b/sys/compat/linuxkpi/common/include/linux/ieee80211.h index c797967f357a..fef68bda4882 100644 --- a/sys/compat/linuxkpi/common/include/linux/ieee80211.h +++ b/sys/compat/linuxkpi/common/include/linux/ieee80211.h @@ -350,11 +350,11 @@ enum ieee80211_smps_mode { /* net80211::IEEE80211_S_* different but represents the state machine. */ /* Note: order here is important! */ enum ieee80211_sta_state { - IEEE80211_STA_NOTEXIST, - IEEE80211_STA_NONE, - IEEE80211_STA_AUTH, - IEEE80211_STA_ASSOC, - IEEE80211_STA_AUTHORIZED, /* 802.1x */ + IEEE80211_STA_NOTEXIST = 0, + IEEE80211_STA_NONE = 1, + IEEE80211_STA_AUTH = 2, + IEEE80211_STA_ASSOC = 3, + IEEE80211_STA_AUTHORIZED = 4, /* 802.1x */ }; enum ieee80211_sta_rx_bw { @@ -553,7 +553,7 @@ enum ieee80211_eid { WLAN_EID_MULTI_BSSID_IDX = 85, WLAN_EID_EXT_CAPABILITY = 127, WLAN_EID_VHT_CAPABILITY = 191, /* IEEE80211_ELEMID_VHT_CAP */ - WLAN_EID_VENDOR_SPECIFIC = 221, + WLAN_EID_VENDOR_SPECIFIC = 221, /* IEEE80211_ELEMID_VENDOR */ }; enum ieee80211_eid_ext { diff --git a/sys/compat/linuxkpi/common/include/linux/nl80211.h b/sys/compat/linuxkpi/common/include/linux/nl80211.h index e4c904ff5cac..76f97b1faaea 100644 --- a/sys/compat/linuxkpi/common/include/linux/nl80211.h +++ b/sys/compat/linuxkpi/common/include/linux/nl80211.h @@ -248,6 +248,7 @@ enum nl80211_sta_info { NL80211_STA_INFO_TX_BITRATE, NL80211_STA_INFO_TX_PACKETS, NL80211_STA_INFO_TX_BYTES, + NL80211_STA_INFO_TX_BYTES64, NL80211_STA_INFO_TX_FAILED, NL80211_STA_INFO_TX_RETRIES, NL80211_STA_INFO_RX_DURATION, diff --git a/sys/compat/linuxkpi/common/include/net/regulatory.h b/sys/compat/linuxkpi/common/include/net/regulatory.h index a7b31812e308..a020323ae7dd 100644 --- a/sys/compat/linuxkpi/common/include/net/regulatory.h +++ b/sys/compat/linuxkpi/common/include/net/regulatory.h @@ -32,6 +32,10 @@ #ifndef _LINUXKPI_NET_REGULATORY_H #define _LINUXKPI_NET_REGULATORY_H +enum environment_cap { + ENVIRON_INDOOR = 1, /* keep != 0 */ +}; + #define REG_RULE(_begin, _end, _bw, _mag, _meirp, _flags) \ { \ .flags = (_flags), \