From 69cc1630014b7c50f754f5d49cfd4ed2905a5c48 Mon Sep 17 00:00:00 2001
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Mon, 28 Nov 2022 21:21:06 +0000
Subject: [PATCH] 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),						\