d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

80211: consistently spell 80P80

Browse Source 
The standard uses 80+80 and 80p80 but nowhere 80_80.
Switch the latter to 80P80 for all the macros and comments refering
to #defined flags which I could find.
The only place we leave as 80p80 is the ifconfig command line arguments
as we spell them all in lower case.
Ideally we would use 80+80 for any interactions with the user and
80P80 for anything internal but let us not confuse parsers and
hence avoid the '+' in either case.

Reviewed by:	adrian, gnn
MFC after:	2 weeks
Sponsored by:	Rubicon Communications, LLC (d/b/a "Netgate")
Differential Revision:	https://reviews.freebsd.org/D26001
This commit is contained in:
Bjoern A. Zeeb 2020-08-17 12:52:57 +00:00
parent e4a14ce70f
commit fd6eb8fec7
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/lib80211/lib80211_regdomain.c
View File

@ -192,7 +192,7 @@ decode_flag(struct mystate *mt, const char *p, int len)
FLAG(IEEE80211_CHAN_VHT40), FLAG(IEEE80211_CHAN_VHT40),
FLAG(IEEE80211_CHAN_VHT80), FLAG(IEEE80211_CHAN_VHT80),
/* /*
* XXX VHT80_80? This likely should be done by * XXX VHT80P80? This likely should be done by
* 80MHz chan logic in net80211 / ifconfig. * 80MHz chan logic in net80211 / ifconfig.
*/ */
FLAG(IEEE80211_CHAN_VHT160), FLAG(IEEE80211_CHAN_VHT160),

6
sbin/ifconfig/ifieee80211.c
View File

@ -2177,7 +2177,7 @@ regdomain_addchans(struct ieee80211req_chaninfo *ci,
/* /*
* VHT first - HT is a subset. * VHT first - HT is a subset.
* *
* XXX TODO: VHT80p80, VHT160 is not yet done. * XXX TODO: VHT80P80, VHT160 is not yet done.
*/ */
if (flags & IEEE80211_CHAN_VHT) { if (flags & IEEE80211_CHAN_VHT) {
if ((chanFlags & IEEE80211_CHAN_VHT20) && if ((chanFlags & IEEE80211_CHAN_VHT20) &&
@ -2387,7 +2387,7 @@ regdomain_makechannels(
&dc->dc_chaninfo); &dc->dc_chaninfo);
} }
/* XXX TODO: VHT80_80, VHT160 */ /* XXX TODO: VHT80P80, VHT160 */
} }
if (!LIST_EMPTY(&rd->bands_11ng) && dc->dc_htcaps != 0) { if (!LIST_EMPTY(&rd->bands_11ng) && dc->dc_htcaps != 0) {
@ -4015,7 +4015,7 @@ chanpref(const struct ieee80211_channel *c)
{ {
if (IEEE80211_IS_CHAN_VHT160(c)) if (IEEE80211_IS_CHAN_VHT160(c))
return 80; return 80;
if (IEEE80211_IS_CHAN_VHT80_80(c)) if (IEEE80211_IS_CHAN_VHT80P80(c))
return 75; return 75;
if (IEEE80211_IS_CHAN_VHT80(c)) if (IEEE80211_IS_CHAN_VHT80(c))
return 70; return 70;

10
sys/net80211/_ieee80211.h
View File

@ -194,7 +194,7 @@ struct ieee80211_channel {
#define IEEE80211_CHAN_VHT40U 0x02000000 /* VHT40 channel, ext above */ #define IEEE80211_CHAN_VHT40U 0x02000000 /* VHT40 channel, ext above */
#define IEEE80211_CHAN_VHT40D 0x04000000 /* VHT40 channel, ext below */ #define IEEE80211_CHAN_VHT40D 0x04000000 /* VHT40 channel, ext below */
#define IEEE80211_CHAN_VHT80 0x08000000 /* VHT80 channel */ #define IEEE80211_CHAN_VHT80 0x08000000 /* VHT80 channel */
#define IEEE80211_CHAN_VHT80_80 0x10000000 /* VHT80+80 channel */ #define IEEE80211_CHAN_VHT80P80 0x10000000 /* VHT80+80 channel */
#define IEEE80211_CHAN_VHT160 0x20000000 /* VHT160 channel */ #define IEEE80211_CHAN_VHT160 0x20000000 /* VHT160 channel */
/* XXX note: 0x80000000 is used in src/sbin/ifconfig/ifieee80211.c :( */ /* XXX note: 0x80000000 is used in src/sbin/ifconfig/ifieee80211.c :( */
@ -203,14 +203,14 @@ struct ieee80211_channel {
#define IEEE80211_CHAN_VHT40 (IEEE80211_CHAN_VHT40U | IEEE80211_CHAN_VHT40D) #define IEEE80211_CHAN_VHT40 (IEEE80211_CHAN_VHT40U | IEEE80211_CHAN_VHT40D)
#define IEEE80211_CHAN_VHT (IEEE80211_CHAN_VHT20 | IEEE80211_CHAN_VHT40 \ #define IEEE80211_CHAN_VHT (IEEE80211_CHAN_VHT20 | IEEE80211_CHAN_VHT40 \
| IEEE80211_CHAN_VHT80 | IEEE80211_CHAN_VHT80_80 \ | IEEE80211_CHAN_VHT80 | IEEE80211_CHAN_VHT80P80 \
| IEEE80211_CHAN_VHT160) | IEEE80211_CHAN_VHT160)
#define IEEE80211_CHAN_BITS \ #define IEEE80211_CHAN_BITS \
"\20\1PRIV0\2PRIV2\3PRIV3\4PRIV4\5TURBO\6CCK\7OFDM\0102GHZ\0115GHZ" \ "\20\1PRIV0\2PRIV2\3PRIV3\4PRIV4\5TURBO\6CCK\7OFDM\0102GHZ\0115GHZ" \
"\12PASSIVE\13DYN\14GFSK\15GSM\16STURBO\17HALF\20QUARTER\21HT20" \ "\12PASSIVE\13DYN\14GFSK\15GSM\16STURBO\17HALF\20QUARTER\21HT20" \
"\22HT40U\23HT40D\24DFS\0254MSXMIT\26NOADHOC\27NOHOSTAP\03011D" \ "\22HT40U\23HT40D\24DFS\0254MSXMIT\26NOADHOC\27NOHOSTAP\03011D" \
"\031VHT20\032VHT40U\033VHT40D\034VHT80\035VHT80_80\036VHT160" "\031VHT20\032VHT40U\033VHT40D\034VHT80\035VHT80P80\036VHT160"
/* /*
* Useful combinations of channel characteristics. * Useful combinations of channel characteristics.
@ -337,8 +337,8 @@ struct ieee80211_channel {
((_c)->ic_flags & IEEE80211_CHAN_VHT) != 0) ((_c)->ic_flags & IEEE80211_CHAN_VHT) != 0)
#define IEEE80211_IS_CHAN_VHT80(_c) \ #define IEEE80211_IS_CHAN_VHT80(_c) \
(((_c)->ic_flags & IEEE80211_CHAN_VHT80) != 0) (((_c)->ic_flags & IEEE80211_CHAN_VHT80) != 0)
#define IEEE80211_IS_CHAN_VHT80_80(_c) \ #define IEEE80211_IS_CHAN_VHT80P80(_c) \
(((_c)->ic_flags & IEEE80211_CHAN_VHT80_80) != 0) (((_c)->ic_flags & IEEE80211_CHAN_VHT80P80) != 0)
#define IEEE80211_IS_CHAN_VHT160(_c) \ #define IEEE80211_IS_CHAN_VHT160(_c) \
(((_c)->ic_flags & IEEE80211_CHAN_VHT160) != 0) (((_c)->ic_flags & IEEE80211_CHAN_VHT160) != 0)

2
sys/net80211/ieee80211_ht.c
View File

@ -1957,7 +1957,7 @@ ieee80211_vht_get_vhtflags(struct ieee80211_node *ni, uint32_t htflags)
(MS(vap->iv_vhtcaps, (MS(vap->iv_vhtcaps,
IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_MASK) == 2) && IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_MASK) == 2) &&
(vap->iv_flags_vht & IEEE80211_FVHT_USEVHT80P80)) { (vap->iv_flags_vht & IEEE80211_FVHT_USEVHT80P80)) {
vhtflags = IEEE80211_CHAN_VHT80_80; vhtflags = IEEE80211_CHAN_VHT80P80;
/* Mirror the HT40 flags */ /* Mirror the HT40 flags */
if (htflags == IEEE80211_CHAN_HT40U) { if (htflags == IEEE80211_CHAN_HT40U) {
vhtflags |= IEEE80211_CHAN_HT40U; vhtflags |= IEEE80211_CHAN_HT40U;

2
sys/net80211/ieee80211_var.h
View File

@ -924,7 +924,7 @@ static __inline int
ieee80211_vhtchanflags(const struct ieee80211_channel *c) ieee80211_vhtchanflags(const struct ieee80211_channel *c)
{ {
if (IEEE80211_IS_CHAN_VHT80_80(c)) if (IEEE80211_IS_CHAN_VHT80P80(c))
return IEEE80211_FVHT_USEVHT80P80; return IEEE80211_FVHT_USEVHT80P80;
if (IEEE80211_IS_CHAN_VHT160(c)) if (IEEE80211_IS_CHAN_VHT160(c))
return IEEE80211_FVHT_USEVHT160; return IEEE80211_FVHT_USEVHT160;

4
sys/net80211/ieee80211_vht.c
View File

@ -705,7 +705,7 @@ ieee80211_vht_get_chwidth_ie(struct ieee80211_channel *c)
if (IEEE80211_IS_CHAN_VHT160(c)) { if (IEEE80211_IS_CHAN_VHT160(c)) {
return IEEE80211_VHT_CHANWIDTH_160MHZ; return IEEE80211_VHT_CHANWIDTH_160MHZ;
} }
if (IEEE80211_IS_CHAN_VHT80_80(c)) { if (IEEE80211_IS_CHAN_VHT80P80(c)) {
return IEEE80211_VHT_CHANWIDTH_80P80MHZ; return IEEE80211_VHT_CHANWIDTH_80P80MHZ;
} }
if (IEEE80211_IS_CHAN_VHT80(c)) { if (IEEE80211_IS_CHAN_VHT80(c)) {
@ -817,7 +817,7 @@ ieee80211_vht_adjust_channel(struct ieee80211com *ic,
c = findvhtchan(ic, chan, IEEE80211_CHAN_VHT80); c = findvhtchan(ic, chan, IEEE80211_CHAN_VHT80);
if ((c == NULL) && (flags & IEEE80211_FVHT_USEVHT80P80)) if ((c == NULL) && (flags & IEEE80211_FVHT_USEVHT80P80))
c = findvhtchan(ic, chan, IEEE80211_CHAN_VHT80_80); c = findvhtchan(ic, chan, IEEE80211_CHAN_VHT80P80);
if ((c == NULL) && (flags & IEEE80211_FVHT_USEVHT80)) if ((c == NULL) && (flags & IEEE80211_FVHT_USEVHT80))
c = findvhtchan(ic, chan, IEEE80211_CHAN_VHT80); c = findvhtchan(ic, chan, IEEE80211_CHAN_VHT80);