mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-17 10:26:15 +00:00
Fix 1/2 and 1/4 width channel handling for non-GSM operation:
o correct typo that caused random channel selection o explicitly add 1/2 and 1/4 width channels because channel lookups match flags that include IEEE80211_CHANNEL_HALF and IEEE80211_CHANNEL_QUARTER
This commit is contained in:
parent
5efbe863bd
commit
5814deb84d
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=187342
@ -1806,7 +1806,7 @@ regdomain_addchans(struct ieee80211req_chaninfo *ci,
|
||||
continue;
|
||||
}
|
||||
if ((flags & IEEE80211_CHAN_QUARTER) &&
|
||||
((chanFlags & IEEE80211_CHAN_HALF) == 0 &&
|
||||
((chanFlags & IEEE80211_CHAN_QUARTER) == 0 &&
|
||||
(flags & IEEE80211_CHAN_GSM) == 0)) {
|
||||
if (verbose)
|
||||
printf("%u: skip, device does not support quarter-rate channels\n", freq);
|
||||
@ -1900,12 +1900,26 @@ regdomain_makechannels(
|
||||
if (!LIST_EMPTY(&rd->bands_11b))
|
||||
regdomain_addchans(ci, &rd->bands_11b, reg,
|
||||
IEEE80211_CHAN_B, &dc->dc_chaninfo);
|
||||
if (!LIST_EMPTY(&rd->bands_11g))
|
||||
if (!LIST_EMPTY(&rd->bands_11g)) {
|
||||
regdomain_addchans(ci, &rd->bands_11g, reg,
|
||||
IEEE80211_CHAN_G, &dc->dc_chaninfo);
|
||||
if (!LIST_EMPTY(&rd->bands_11a))
|
||||
regdomain_addchans(ci, &rd->bands_11g, reg,
|
||||
IEEE80211_CHAN_G | IEEE80211_CHAN_HALF,
|
||||
&dc->dc_chaninfo);
|
||||
regdomain_addchans(ci, &rd->bands_11g, reg,
|
||||
IEEE80211_CHAN_G | IEEE80211_CHAN_QUARTER,
|
||||
&dc->dc_chaninfo);
|
||||
}
|
||||
if (!LIST_EMPTY(&rd->bands_11a)) {
|
||||
regdomain_addchans(ci, &rd->bands_11a, reg,
|
||||
IEEE80211_CHAN_A, &dc->dc_chaninfo);
|
||||
regdomain_addchans(ci, &rd->bands_11a, reg,
|
||||
IEEE80211_CHAN_A | IEEE80211_CHAN_HALF,
|
||||
&dc->dc_chaninfo);
|
||||
regdomain_addchans(ci, &rd->bands_11a, reg,
|
||||
IEEE80211_CHAN_A | IEEE80211_CHAN_QUARTER,
|
||||
&dc->dc_chaninfo);
|
||||
}
|
||||
if (!LIST_EMPTY(&rd->bands_11na)) {
|
||||
regdomain_addchans(ci, &rd->bands_11na, reg,
|
||||
IEEE80211_CHAN_A | IEEE80211_CHAN_HT20,
|
||||
|
Loading…
Reference in New Issue
Block a user