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

guard against adhoc_pick_channel returning a NULL channel; this can

Browse Source 
happen after a scan cache flush (e.g. in response to ifconfig wlan bssid -)
This commit is contained in:
Sam Leffler 2008-09-27 21:18:40 +00:00
parent 4bf0267894
commit 63c61408ef
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/net80211/ieee80211_scan_sta.c
View File

@ -1392,9 +1392,12 @@ notfound:
*/
if (vap->iv_des_chan == IEEE80211_CHAN_ANYC ||
IEEE80211_IS_CHAN_RADAR(vap->iv_des_chan)) {
chan = ieee80211_ht_adjust_channel(vap->iv_ic,
adhoc_pick_channel(ss, 0),
vap->iv_flags_ext);
struct ieee80211com *ic = vap->iv_ic;
chan = adhoc_pick_channel(ss, 0);
if (chan != NULL)
chan = ieee80211_ht_adjust_channel(ic,
chan, vap->iv_flags_ext);
} else
chan = vap->iv_des_chan;
if (chan != NULL) {