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

80211: non-functional changes

Browse Source 
Sort a few VHT160 and 80+80 lines, update some comments, and remove
a superfluous ','.

No functional changes intended.

MFC after:	1 week
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Bjoern A. Zeeb 2020-10-07 21:56:58 +00:00
parent cc71ff7234
commit 1e375f3aa7
4 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/lib80211/lib80211_regdomain.c
View File

@ -191,11 +191,11 @@ decode_flag(struct mystate *mt, const char *p, int len)
FLAG(IEEE80211_CHAN_VHT20), FLAG(IEEE80211_CHAN_VHT20),
FLAG(IEEE80211_CHAN_VHT40), FLAG(IEEE80211_CHAN_VHT40),
FLAG(IEEE80211_CHAN_VHT80), FLAG(IEEE80211_CHAN_VHT80),
FLAG(IEEE80211_CHAN_VHT160),
/* /*
* XXX VHT80P80? 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_ST), FLAG(IEEE80211_CHAN_ST),
FLAG(IEEE80211_CHAN_TURBO), FLAG(IEEE80211_CHAN_TURBO),
FLAG(IEEE80211_CHAN_PASSIVE), FLAG(IEEE80211_CHAN_PASSIVE),

3
sbin/ifconfig/ifieee80211.c
View File

@ -2385,8 +2385,7 @@ regdomain_makechannels(
&dc->dc_chaninfo); &dc->dc_chaninfo);
} }
/* VHT80 */ /* VHT80 is mandatory (and so should be VHT40 above). */
/* XXX dc_vhtcap? */
if (1) { if (1) {
regdomain_addchans(ci, &rd->bands_11ac, reg, regdomain_addchans(ci, &rd->bands_11ac, reg,
IEEE80211_CHAN_A | IEEE80211_CHAN_HT40U | IEEE80211_CHAN_A | IEEE80211_CHAN_HT40U |

12
sys/net80211/ieee80211.c
View File

@ -158,7 +158,7 @@ ieee80211_chan_init(struct ieee80211com *ic)
/* /*
* Setup the HT40/VHT40 upper/lower bits. * Setup the HT40/VHT40 upper/lower bits.
* The VHT80 math is done elsewhere. * The VHT80/... math is done elsewhere.
*/ */
if (IEEE80211_IS_CHAN_HT40(c) && c->ic_extieee == 0) if (IEEE80211_IS_CHAN_HT40(c) && c->ic_extieee == 0)
c->ic_extieee = ieee80211_mhz2ieee(c->ic_freq + c->ic_extieee = ieee80211_mhz2ieee(c->ic_freq +
@ -167,8 +167,8 @@ ieee80211_chan_init(struct ieee80211com *ic)
/* Update VHT math */ /* Update VHT math */
/* /*
* XXX VHT again, note that this assumes VHT80 channels * XXX VHT again, note that this assumes VHT80/... channels
* are legit already * are legit already.
*/ */
set_vht_extchan(c); set_vht_extchan(c);
@ -712,8 +712,8 @@ ieee80211_vap_attach(struct ieee80211vap *vap, ifm_change_cb_t media_change,
ieee80211_syncflag_vht_locked(ic, IEEE80211_FVHT_VHT); ieee80211_syncflag_vht_locked(ic, IEEE80211_FVHT_VHT);
ieee80211_syncflag_vht_locked(ic, IEEE80211_FVHT_USEVHT40); ieee80211_syncflag_vht_locked(ic, IEEE80211_FVHT_USEVHT40);
ieee80211_syncflag_vht_locked(ic, IEEE80211_FVHT_USEVHT80); ieee80211_syncflag_vht_locked(ic, IEEE80211_FVHT_USEVHT80);
ieee80211_syncflag_vht_locked(ic, IEEE80211_FVHT_USEVHT80P80);
ieee80211_syncflag_vht_locked(ic, IEEE80211_FVHT_USEVHT160); ieee80211_syncflag_vht_locked(ic, IEEE80211_FVHT_USEVHT160);
ieee80211_syncflag_vht_locked(ic, IEEE80211_FVHT_USEVHT80P80);
IEEE80211_UNLOCK(ic); IEEE80211_UNLOCK(ic);
return 1; return 1;
@ -767,8 +767,8 @@ ieee80211_vap_detach(struct ieee80211vap *vap)
ieee80211_syncflag_vht_locked(ic, IEEE80211_FVHT_VHT); ieee80211_syncflag_vht_locked(ic, IEEE80211_FVHT_VHT);
ieee80211_syncflag_vht_locked(ic, IEEE80211_FVHT_USEVHT40); ieee80211_syncflag_vht_locked(ic, IEEE80211_FVHT_USEVHT40);
ieee80211_syncflag_vht_locked(ic, IEEE80211_FVHT_USEVHT80); ieee80211_syncflag_vht_locked(ic, IEEE80211_FVHT_USEVHT80);
ieee80211_syncflag_vht_locked(ic, IEEE80211_FVHT_USEVHT80P80);
ieee80211_syncflag_vht_locked(ic, IEEE80211_FVHT_USEVHT160); ieee80211_syncflag_vht_locked(ic, IEEE80211_FVHT_USEVHT160);
ieee80211_syncflag_vht_locked(ic, IEEE80211_FVHT_USEVHT80P80);
/* NB: this handles the bpfdetach done below */ /* NB: this handles the bpfdetach done below */
ieee80211_syncflag_ext_locked(ic, IEEE80211_FEXT_BPF); ieee80211_syncflag_ext_locked(ic, IEEE80211_FEXT_BPF);
@ -1160,7 +1160,7 @@ struct vht_chan_range vht80_chan_ranges[] = {
{ 5570, 5650 }, { 5570, 5650 },
{ 5650, 5730 }, { 5650, 5730 },
{ 5735, 5815 }, { 5735, 5815 },
{ 0, 0, } { 0, 0 }
}; };
static int static int

2
sys/net80211/ieee80211_node.h
View File

@ -70,7 +70,7 @@ struct ieee80211vap;
struct ieee80211_scanparams; struct ieee80211_scanparams;
/* /*
* Information element ``blob''. We use this structure * Information element (IE) ``blob''. We use this structure
* to capture management frame payloads that need to be * to capture management frame payloads that need to be
* retained. Information elements within the payload that * retained. Information elements within the payload that
* we need to consult have references recorded. * we need to consult have references recorded.