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

In add_channel(), search 11g channels if mode is AUTO and corresponding

Browse Source 
11b channel is not found, e.g. Atheros 5211.

Reported by: matteo
Problem outlined by: thompsa
Reviewed by: sam, thompsa
Approved by: re (kensmith), sam (mentor)
Tested by: matteo (an early version)
This commit is contained in:
sephe 2007-07-20 11:38:12 +00:00
parent f1da927af0
commit 9adf8173c2
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/net80211/ieee80211_scan_sta.c
View File

@ -376,17 +376,23 @@ add_channels(struct ieee80211com *ic,
break;
c = ieee80211_find_channel(ic, freq[i], modeflags);
if (c == NULL || isexcluded(ic, c))
if (c != NULL && isexcluded(ic, c))
continue;
if (mode == IEEE80211_MODE_AUTO) {
/*
* XXX special-case 11b/g channels so we select
* the g channel if both are present.
* the g channel if both are present or there
* are only g channels.
*/
if (IEEE80211_IS_CHAN_B(c) &&
(cg = find11gchannel(ic, i, c->ic_freq)) != NULL)
c = cg;
if (c == NULL || IEEE80211_IS_CHAN_B(c)) {
cg = find11gchannel(ic, i, freq[i]);
if (cg != NULL)
c = cg;
}
}
if (c == NULL)
continue;
ss->ss_chans[ss->ss_last++] = c;
}
#undef N