Date: Sat, 2 Feb 2019 16:21:23 +0000 (UTC) From: Andriy Voskoboinyk <avos@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r343683 - head/sys/net80211 Message-ID: <201902021621.x12GLN6p002505@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: avos Date: Sat Feb 2 16:21:23 2019 New Revision: 343683 URL: https://svnweb.freebsd.org/changeset/base/343683 Log: Do not acquire IEEE80211_LOCK twice in cac_timeout(); reuse locked function instead. It is externally visible since r257065. MFC after: 5 days Modified: head/sys/net80211/ieee80211_dfs.c Modified: head/sys/net80211/ieee80211_dfs.c ============================================================================== --- head/sys/net80211/ieee80211_dfs.c Sat Feb 2 16:15:46 2019 (r343682) +++ head/sys/net80211/ieee80211_dfs.c Sat Feb 2 16:21:23 2019 (r343683) @@ -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; "
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201902021621.x12GLN6p002505>