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

Do not acquire IEEE80211_LOCK twice in cac_timeout(); reuse

Browse Source 
locked function instead.

It is externally visible since r257065.

MFC after:	5 days
This commit is contained in:
Andriy Voskoboinyk 2019-02-02 16:21:23 +00:00
parent 4215ce4820
commit 4ab4d681f3
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/net80211/ieee80211_dfs.c
View File

@ -156,8 +156,7 @@ cac_timeout(void *arg)
/* XXX clobbers any existing desired channel */
/* NB: dfs->newchan may be NULL, that's ok */
vap->iv_des_chan = dfs->newchan;
/* XXX recursive lock need ieee80211_new_state_locked */
ieee80211_new_state(vap, IEEE80211_S_SCAN, 0);
ieee80211_new_state_locked(vap, IEEE80211_S_SCAN, 0);
} else {
if_printf(vap->iv_ifp,
"CAC timer on channel %u (%u MHz) expired; "