Author: avos
Date: Fri Feb 8 04:48:12 2019
New Revision: 343894
URL: https://svnweb.freebsd.org/changeset/base/343894
Log:
MFC r343683:
Do not acquire IEEE80211_LOCK twice in cac_timeout(); reuse
locked function instead.
It is externally visible since r257065.
Modified:
stable/10/sys/net80211/ieee80211_dfs.c
Directory Properties:
stable/10/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/11/sys/net80211/ieee80211_dfs.c
stable/12/sys/net80211/ieee80211_dfs.c
Directory Properties:
stable/11/ (props changed)
stable/12/ (props changed)
Modified: stable/10/sys/net80211/ieee80211_dfs.c
==============================================================================
--- stable/10/sys/net80211/ieee80211_dfs.c Fri Feb 8 04:36:30 2019
(r343893)
+++ stable/10/sys/net80211/ieee80211_dfs.c Fri Feb 8 04:48:12 2019
(r343894)
@@ -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; "
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
