From owner-p4-projects@FreeBSD.ORG  Tue May 29 01:55:29 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1E43D16A4EA; Tue, 29 May 2007 01:55:29 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id E899516A4D8
	for <perforce@freebsd.org>; Tue, 29 May 2007 01:55:28 +0000 (UTC)
	(envelope-from thompsa@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id C072513C489
	for <perforce@freebsd.org>; Tue, 29 May 2007 01:55:28 +0000 (UTC)
	(envelope-from thompsa@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4T1tShP025474
	for <perforce@freebsd.org>; Tue, 29 May 2007 01:55:28 GMT
	(envelope-from thompsa@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4T1tSi1025464
	for perforce@freebsd.org; Tue, 29 May 2007 01:55:28 GMT
	(envelope-from thompsa@freebsd.org)
Date: Tue, 29 May 2007 01:55:28 GMT
Message-Id: <200705290155.l4T1tSi1025464@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	thompsa@freebsd.org using -f
From: Andrew Thompson <thompsa@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 120532 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 29 May 2007 01:55:29 -0000

http://perforce.freebsd.org/chv.cgi?CH=120532

Change 120532 by thompsa@thompsa_heff on 2007/05/29 01:54:56

	Set if_timer so that sc_scantimer is checked by iwi_watchdog (this
	should be on our own callout)

Affected files ...

.. //depot/projects/wifi/sys/dev/iwi/if_iwi.c#29 edit

Differences ...

==== //depot/projects/wifi/sys/dev/iwi/if_iwi.c#29 (text+ko) ====

@@ -2695,7 +2695,8 @@
 
 	DPRINTF(("Scanning on channel %u\n", ieee80211_chan2ieee(ic, chan)));
 	sc->flags |= IWI_FLAG_SCANNING;
-	sc->sc_scan_timer = 1;
+	sc->sc_scan_timer = 3;
+	sc->sc_ifp->if_timer = 1;
 
 	return (iwi_cmd(sc, IWI_CMD_SCAN_EXT, &scan, sizeof scan));
 }