Date: Fri, 8 Feb 2019 04:48:13 +0000 (UTC) From: Andriy Voskoboinyk <avos@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r343894 - in stable: 10/sys/net80211 11/sys/net80211 12/sys/net80211 Message-ID: <201902080448.x184mDWQ007128@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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/11/sys/net80211/ieee80211_dfs.c Directory Properties: stable/11/ (props changed) Changes in other areas also in this revision: Modified: stable/10/sys/net80211/ieee80211_dfs.c stable/12/sys/net80211/ieee80211_dfs.c Directory Properties: stable/10/ (props changed) stable/12/ (props changed) Modified: stable/11/sys/net80211/ieee80211_dfs.c ============================================================================== --- stable/11/sys/net80211/ieee80211_dfs.c Fri Feb 8 04:36:30 2019 (r343893) +++ stable/11/sys/net80211/ieee80211_dfs.c Fri Feb 8 04:48:12 2019 (r343894) @@ -154,8 +154,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; "
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201902080448.x184mDWQ007128>