[src-draft/trunk]: src/sys/net80211 Backed out changeset 5c7ef6605319 - super...

[Martin Husemann <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src-all/rev/9c670dcef573
branches:  trunk
changeset: 376701:9c670dcef573
user:      Martin Husemann <martin%NetBSD.org@localhost>
date:      Mon Mar 14 19:57:03 2022 +0100

description:
Backed out changeset 5c7ef6605319 - superseeded by later import
of a newer version from FreeBSD.

diffstat:

 sys/net80211/_ieee80211.h |  52 +++++++++-------------------------------------
 1 files changed, 11 insertions(+), 41 deletions(-)

diffs (62 lines):

diff -r 8004e8496415 -r 9c670dcef573 sys/net80211/_ieee80211.h
--- a/sys/net80211/_ieee80211.h Sat Mar 19 08:29:33 2022 +0100
+++ b/sys/net80211/_ieee80211.h Mon Mar 14 19:57:03 2022 +0100
@@ -116,47 +116,17 @@ extern const struct ieee80211_channel ie
 
 /* bits 0-3 are for private use by drivers */
 /* channel attributes */
-#define        IEEE80211_CHAN_TURBO    0x00000010      /* Turbo channel */
-#define        IEEE80211_CHAN_CCK      0x00000020      /* CCK channel */
-#define        IEEE80211_CHAN_OFDM     0x00000040      /* OFDM channel */
-#define        IEEE80211_CHAN_2GHZ     0x00000080      /* 2 GHz spectrum channel. */
-#define        IEEE80211_CHAN_5GHZ     0x00000100      /* 5 GHz spectrum channel */
-#define        IEEE80211_CHAN_PASSIVE  0x00000200      /* Only passive scan allowed */
-#define        IEEE80211_CHAN_DYN      0x00000400      /* Dynamic CCK-OFDM channel */
-#define        IEEE80211_CHAN_GFSK     0x00000800      /* GFSK channel (FHSS PHY) */
-#define        IEEE80211_CHAN_GSM      0x00001000      /* 900 MHz spectrum channel */
-#define        IEEE80211_CHAN_HALF     0x00004000      /* Half rate channel */
-#define        IEEE80211_CHAN_QUARTER  0x00008000      /* Quarter rate channel */
-#define        IEEE80211_CHAN_HT20     0x00010000      /* HT 20 channel */
-#define        IEEE80211_CHAN_HT40U    0x00020000      /* HT 40 channel w/ ext above */
-#define        IEEE80211_CHAN_HT40D    0x00040000      /* HT 40 channel w/ ext below */
-#define        IEEE80211_CHAN_DFS      0x00080000      /* DFS required */
-#define        IEEE80211_CHAN_4MSXMIT  0x00100000      /* 4ms limit on frame length */
-#define        IEEE80211_CHAN_NOADHOC  0x00200000      /* adhoc mode not allowed */
-#define        IEEE80211_CHAN_NOHOSTAP 0x00400000      /* hostap mode not allowed */
-#define        IEEE80211_CHAN_11D      0x00800000      /* 802.11d required */
-#define        IEEE80211_CHAN_VHT20    0x01000000      /* VHT20 channel */
-#define        IEEE80211_CHAN_VHT40U   0x02000000      /* VHT40 channel, ext above */
-#define        IEEE80211_CHAN_VHT40D   0x04000000      /* VHT40 channel, ext below */
-#define        IEEE80211_CHAN_VHT80    0x08000000      /* VHT80 channel */
-#define        IEEE80211_CHAN_VHT80_80 0x10000000      /* VHT80+80 channel */
-#define        IEEE80211_CHAN_VHT160   0x20000000      /* VHT160 channel */
-#define        IEEE80211_CHAN_HT20     0x00010000      /* HT 20 channel */
-#define        IEEE80211_CHAN_HT40U    0x00020000      /* HT 40 channel w/ ext above */
-#define        IEEE80211_CHAN_HT40D    0x00040000      /* HT 40 channel w/ ext below */
-#define        IEEE80211_CHAN_DFS      0x00080000      /* DFS required */
-#define        IEEE80211_CHAN_4MSXMIT  0x00100000      /* 4ms limit on frame length */
-#define        IEEE80211_CHAN_NOADHOC  0x00200000      /* adhoc mode not allowed */
-#define        IEEE80211_CHAN_NOHOSTAP 0x00400000      /* hostap mode not allowed */
-#define        IEEE80211_CHAN_11D      0x00800000      /* 802.11d required */
-
-#define        IEEE80211_CHAN_HT40     (IEEE80211_CHAN_HT40U | IEEE80211_CHAN_HT40D)
-#define        IEEE80211_CHAN_HT       (IEEE80211_CHAN_HT20 | IEEE80211_CHAN_HT40)
-
-#define        IEEE80211_CHAN_VHT40    (IEEE80211_CHAN_VHT40U | IEEE80211_CHAN_VHT40D)
-#define        IEEE80211_CHAN_VHT      (IEEE80211_CHAN_VHT20 | IEEE80211_CHAN_VHT40 \
-                               | IEEE80211_CHAN_VHT80 | IEEE80211_CHAN_VHT80_80 \
-                               | IEEE80211_CHAN_VHT160)
+#define        IEEE80211_CHAN_TURBO    0x0010  /* Turbo channel */
+#define        IEEE80211_CHAN_CCK      0x0020  /* CCK channel */
+#define        IEEE80211_CHAN_OFDM     0x0040  /* OFDM channel */
+#define        IEEE80211_CHAN_2GHZ     0x0080  /* 2 GHz spectrum channel. */
+#define        IEEE80211_CHAN_5GHZ     0x0100  /* 5 GHz spectrum channel */
+#define        IEEE80211_CHAN_PASSIVE  0x0200  /* Only passive scan allowed */
+#define        IEEE80211_CHAN_DYN      0x0400  /* Dynamic CCK-OFDM channel */
+#define        IEEE80211_CHAN_GFSK     0x0800  /* GFSK channel (FHSS PHY) */
+#define        IEEE80211_CHAN_GSM      0x1000  /* 900 MHz spectrum channel */
+#define        IEEE80211_CHAN_HALF     0x4000  /* Half rate channel */
+#define        IEEE80211_CHAN_QUARTER  0x8000  /* Quarter rate channel */
 
 /*
  * Useful combinations of channel characteristics.