From owner-p4-projects@FreeBSD.ORG  Fri Jun  1 20:11:49 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 C937D16A46C; Fri,  1 Jun 2007 20:11:48 +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 7988616A41F
	for <perforce@freebsd.org>; Fri,  1 Jun 2007 20:11:48 +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 6A34C13C45D
	for <perforce@freebsd.org>; Fri,  1 Jun 2007 20:11:48 +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 l51KBm0h048922
	for <perforce@freebsd.org>; Fri, 1 Jun 2007 20:11:48 GMT
	(envelope-from thompsa@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l51KBmVr048908
	for perforce@freebsd.org; Fri, 1 Jun 2007 20:11:48 GMT
	(envelope-from thompsa@freebsd.org)
Date: Fri, 1 Jun 2007 20:11:48 GMT
Message-Id: <200706012011.l51KBmVr048908@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 120722 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: Fri, 01 Jun 2007 20:11:49 -0000

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

Change 120722 by thompsa@thompsa_heff on 2007/06/01 20:11:15

	- fix scan type argument for iwi_scanchan
	- add return on non-void function

Affected files ...

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

Differences ...

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

@@ -3483,7 +3483,7 @@
 			    __func__));
 			goto done;
 		}
-		if (iwi_scanchan(sc, sc->sc_maxdwell, sc->sc_scanop))
+		if (iwi_scanchan(sc, sc->sc_maxdwell, cmd))
 			ieee80211_cancel_scan(ic);
 
 		break;
@@ -3509,6 +3509,7 @@
 	sc->sc_scan_next = (sc->sc_scan_next + 1) % IWI_SCAN_OPS;
 	taskqueue_enqueue(sc->sc_tq, &sc->sc_opstask);
 	IWI_SCAN_UNLOCK(sc);
+	return (0);
 }
 
 static void