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

Correct scan candidate selection logic for dual-band devices: prefer

Browse Source 
candidate on 5Ghz channel to candidate on 2Ghz channel only when the
rssi are comparable (wasn't considering rssi).
This commit is contained in:
Sam Leffler 2005-01-01 17:48:27 +00:00
parent 3baeaf0b19
commit ef92bcdc97
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=139543
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sys/net80211/ieee80211_node.c
View File

@ -547,23 +547,23 @@ ieee80211_node_compare(struct ieee80211com *ic,
(b->ni_capinfo & IEEE80211_CAPINFO_PRIVACY))
return -1;
/* best/max rate preferred if signal level close enough XXX */
maxa = maxrate(a);
maxb = maxrate(b);
rssia = ic->ic_node_getrssi(a);
rssib = ic->ic_node_getrssi(b);
if (maxa != maxb && abs(rssib - rssia) < 5)
return maxa - maxb;
/* XXX use freq for channel preference */
/* for now just prefer 5Ghz band to all other bands */
if (IEEE80211_IS_CHAN_5GHZ(a->ni_chan) &&
!IEEE80211_IS_CHAN_5GHZ(b->ni_chan))
return 1;
if (!IEEE80211_IS_CHAN_5GHZ(a->ni_chan) &&
IEEE80211_IS_CHAN_5GHZ(b->ni_chan))
return -1;
if (abs(rssib - rssia) < 5) {
/* best/max rate preferred if signal level close enough XXX */
maxa = maxrate(a);
maxb = maxrate(b);
if (maxa != maxb)
return maxa - maxb;
/* XXX use freq for channel preference */
/* for now just prefer 5Ghz band to all other bands */
if (IEEE80211_IS_CHAN_5GHZ(a->ni_chan) &&
!IEEE80211_IS_CHAN_5GHZ(b->ni_chan))
return 1;
if (!IEEE80211_IS_CHAN_5GHZ(a->ni_chan) &&
IEEE80211_IS_CHAN_5GHZ(b->ni_chan))
return -1;
}
/* all things being equal, use signal level */
return rssia - rssib;
}