MFC r343683:

Do not acquire IEEE80211_LOCK twice in cac_timeout(); reuse
locked function instead.

It is externally visible since r257065.
This commit is contained in:
Andriy Voskoboinyk 2019-02-08 04:48:12 +00:00
parent ee6d36d2b6
commit d848e0f9f0
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/stable/10/; revision=343894

View File

@ -152,8 +152,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; "