From owner-p4-projects@FreeBSD.ORG Mon May 16 23:56:59 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 556C916A4D1; Mon, 16 May 2005 23:56:59 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2D50F16A4CE for ; Mon, 16 May 2005 23:56:59 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0DA2243D67 for ; Mon, 16 May 2005 23:56:59 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j4GNuuiV055941 for ; Mon, 16 May 2005 23:56:56 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j4GNuuLX055938 for perforce@freebsd.org; Mon, 16 May 2005 23:56:56 GMT (envelope-from sam@freebsd.org) Date: Mon, 16 May 2005 23:56:56 GMT Message-Id: <200505162356.j4GNuuLX055938@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 77085 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 May 2005 23:56:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=77085 Change 77085 by sam@sam_ebb on 2005/05/16 23:56:21 move debug msg to reduce noise Affected files ... .. //depot/projects/vap/sys/net80211/ieee80211_scan.c#3 edit Differences ... ==== //depot/projects/vap/sys/net80211/ieee80211_scan.c#3 (text+ko) ==== @@ -435,12 +435,12 @@ struct ieee80211com *ic = vap->iv_ic; struct ieee80211_scan_state *ss = &ic->ic_scan; - IEEE80211_DPRINTF(vap, IEEE80211_MSG_SCAN, "%s: end %s scan\n", - __func__, - ss->ss_flags & IEEE80211_SCAN_ACTIVE ? "active" : "passive"); - IEEE80211_LOCK(ic); if (ic->ic_flags & IEEE80211_F_SCAN) { + IEEE80211_DPRINTF(vap, IEEE80211_MSG_SCAN, + "%s: cancel %s scan\n", __func__, + ss->ss_flags&IEEE80211_SCAN_ACTIVE ? "active" : "passive"); + callout_drain(&ss->ss_scan_timer); /* XXX maybe this should be handled in the timer routine? */ ic->ic_flags &= ~IEEE80211_F_SCAN;