From nobody Wed Jan 18 16:24:46 2023 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 4Nxrgy4zh8z2yJ1C; Wed, 18 Jan 2023 16:24:46 +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 4Nxrgy2rQWz3DWg; Wed, 18 Jan 2023 16:24:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674059086; 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=3tORZCknIdq368zNdnZxa+YY6uc0EKI5tH6rVDcyXZE=; b=vmej1lVJ7MFQzVI3/AQuiPqK3aMaVmT5kcJX77Ef2/9/VMvcxlCOZRRyCqiaRWfMd5C1YP Cf24o2uzxMvt+7B1L3YmjTTsDYSwQP1hBNwkAdUzG4I3O61B50eNkBX7WT2rULUg/lk0z8 gnLjY2ZAaiI8SsX7GqHIWjue435yTO5IQ+T1rwi7cDhz6c55AEewJnFMvWl6UaHuhhjZMX 6NQVN/aFa9Vv89DbrWBH/6UZp/Ju4ijum/wtG5d+yT/0J7laChnFkOKO9DPjhTC1YUhUb+ Rowk3Nb37yoPCzjhoOd2QV2UHkLqbtXPsF0lITUErrDTDa67MGeKkgR5A/wKtg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674059086; 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=3tORZCknIdq368zNdnZxa+YY6uc0EKI5tH6rVDcyXZE=; b=cHaX7tdEU+AspunqeVNXPzktl5yU12+GyadhIu/XyqW+EqSoRowQDuWYteZK9yh/xrkigb +a/IAaqSeumgjNHMlTzEs+Hm5jS3eFEfV58oXeaBT1qglZVYQedMhaolT3JGGtmJ1aaJS/ cGGJkg+/2SpWZvFNY7oBc8ApG3pzg+IHGQ7jLFcqV4rioJgKLrjRvDrLu4b/xFZ4Tq9j/e BpR9euT8vItVhy8eZd5UANoBBEGAgZHbCglhwGNXif9F9ZsRdL1DB+HJARlI4Fiq5rwWxp DPwdFfGojRM+s9aDQV5+HvrILcsal5x0QNhcuFqmTnAXSc54hVSotc3g3R9Zcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674059086; a=rsa-sha256; cv=none; b=KSh2bGKPp7DowF9OTKa5Bk+l7zga5q9qLSTXCb0czxix3FbeCDKVFjjN+QOuTbjrhD1gU0 ES9zvGqrk3Spf8ZB3pDd03BgHn40Ook8qDrbADhh8R7MLw7lTcJkv0lI2bl9l6avEwqJHB 6ygny12a4rIRROM9izQ3z18yQnOxwqIf0mzG+PSgne85cYhR17Ij4DBZM+9sO5rkFtBehv YjiiTjH/JC6zBm8HC5G34OljSsepfSXgDnrR4gYTjWV26mEwUs3JiZMmu7MkjzxjBmJo0p N2YYfX6P2kvCYm28rcgWAoH6PBOfqA7W8QQWw3aZoJj3S5WhVuUfmQy+3Cf0Cg== 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 4Nxrgy1rf3zJB1; Wed, 18 Jan 2023 16:24:46 +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 30IGOkbL037861; Wed, 18 Jan 2023 16:24:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30IGOkh1037860; Wed, 18 Jan 2023 16:24:46 GMT (envelope-from git) Date: Wed, 18 Jan 2023 16:24:46 GMT Message-Id: <202301181624.30IGOkh1037860@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: 4a9e77caec57 - stable/13 - LinuxKPI: 802.11: minor header updates 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: 4a9e77caec57fa8272c55986a2f0464780c011b2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=4a9e77caec57fa8272c55986a2f0464780c011b2 commit 4a9e77caec57fa8272c55986a2f0464780c011b2 Author: Bjoern A. Zeeb AuthorDate: 2022-11-28 21:21:06 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-01-18 13:24:01 +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. (cherry picked from commit 69cc1630014b7c50f754f5d49cfd4ed2905a5c48) --- 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), \