diff options
| author |   stsp <stsp@openbsd.org> | 2019-01-15 10:00:47 +0000 |
|---|---|---|
| committer | stsp <stsp@openbsd.org> | 2019-01-15 10:00:47 +0000 |
| commit | a2631858cf077e0f46d9a506f94fe26f69b44b2d (patch) | |
| tree | bfca2663edc63dd46e706a21abaa691647631503 | |
| parent | Do not highlight characters which will not be copied, reported by (diff) | |
| download | wireguard-openbsd-a2631858cf077e0f46d9a506f94fe26f69b44b2d.tar.xz wireguard-openbsd-a2631858cf077e0f46d9a506f94fe26f69b44b2d.zip | |
Rename some data frame subtype macros to make the difference between
"data" and "no data" frames more obvious. These renamed macros aren't
actually used anywhere in net80211 yet.
cross-checked with 802.11 specs by myself and Lauri Tirkkonen
| -rw-r--r-- | sys/net80211/ieee80211.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/net80211/ieee80211.h b/sys/net80211/ieee80211.h index d7be80a4562..42089548b41 100644 --- a/sys/net80211/ieee80211.h +++ b/sys/net80211/ieee80211.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ieee80211.h,v 1.60 2017/07/02 14:48:19 kevlo Exp $ */ +/* $OpenBSD: ieee80211.h,v 1.61 2019/01/15 10:00:47 stsp Exp $ */ /* $NetBSD: ieee80211.h,v 1.6 2004/04/30 23:51:53 dyoung Exp $ */ /*- @@ -140,13 +140,13 @@ struct ieee80211_htframe_addr4 { /* 11n */ #define IEEE80211_FC0_SUBTYPE_CF_END_ACK 0xf0 /* for TYPE_DATA (bit combination) */ #define IEEE80211_FC0_SUBTYPE_DATA 0x00 -#define IEEE80211_FC0_SUBTYPE_CF_ACK 0x10 -#define IEEE80211_FC0_SUBTYPE_CF_POLL 0x20 -#define IEEE80211_FC0_SUBTYPE_CF_ACPL 0x30 +#define IEEE80211_FC0_SUBTYPE_DATA_CF_ACK 0x10 +#define IEEE80211_FC0_SUBTYPE_DATA_CF_POLL 0x20 +#define IEEE80211_FC0_SUBTYPE_DATA_CF_ACKPOLL 0x30 #define IEEE80211_FC0_SUBTYPE_NODATA 0x40 -#define IEEE80211_FC0_SUBTYPE_CFACK 0x50 -#define IEEE80211_FC0_SUBTYPE_CFPOLL 0x60 -#define IEEE80211_FC0_SUBTYPE_CF_ACK_CF_ACK 0x70 +#define IEEE80211_FC0_SUBTYPE_NODATA_CF_ACK 0x50 +#define IEEE80211_FC0_SUBTYPE_NODATA_CF_POLL 0x60 +#define IEEE80211_FC0_SUBTYPE_NODATA_CF_ACKPOLL 0x70 #define IEEE80211_FC0_SUBTYPE_QOS 0x80 #define IEEE80211_FC1_DIR_MASK 0x03 |