Date: Sat, 25 Apr 2009 05:52:48 +0000 (UTC) From: Andrew Thompson <thompsa@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r191481 - user/thompsa/vaptq/sys/net80211 Message-ID: <200904250552.n3P5qmAo043710@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: thompsa Date: Sat Apr 25 05:52:48 2009 New Revision: 191481 URL: http://svn.freebsd.org/changeset/base/191481 Log: - Remove the lock assert before cv_signal() as the pointer to the ic may be dead, as its a static function the callers can be verified. - Assert the scan has been stopped before freeing the memory. Modified: user/thompsa/vaptq/sys/net80211/ieee80211_scan.c Modified: user/thompsa/vaptq/sys/net80211/ieee80211_scan.c ============================================================================== --- user/thompsa/vaptq/sys/net80211/ieee80211_scan.c Sat Apr 25 05:45:08 2009 (r191480) +++ user/thompsa/vaptq/sys/net80211/ieee80211_scan.c Sat Apr 25 05:52:48 2009 (r191481) @@ -131,6 +131,8 @@ ieee80211_scan_detach(struct ieee80211co scan_signal(ss); IEEE80211_UNLOCK(ic); taskqueue_drain(ic->ic_tq, &SCAN_PRIVATE(ss)->ss_scan_task); + KASSERT((ic->ic_flags & IEEE80211_F_SCAN) == 0, + ("scan still running")); if (ss->ss_ops != NULL) { ss->ss_ops->scan_detach(ss); ss->ss_ops = NULL; @@ -813,8 +815,6 @@ scan_signal(void *arg) { struct ieee80211_scan_state *ss = (struct ieee80211_scan_state *) arg; - IEEE80211_LOCK_ASSERT(ss->ss_vap->iv_ic); - cv_signal(&SCAN_PRIVATE(ss)->ss_scan_cv); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200904250552.n3P5qmAo043710>