From owner-p4-projects@FreeBSD.ORG  Tue Feb 19 09:14:40 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2999516A46E; Tue, 19 Feb 2008 09:14:40 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E261316A46B
	for <perforce@freebsd.org>; Tue, 19 Feb 2008 09:14:39 +0000 (UTC)
	(envelope-from thompsa@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 981FF13C4F6
	for <perforce@freebsd.org>; Tue, 19 Feb 2008 09:14:39 +0000 (UTC)
	(envelope-from thompsa@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1J9EdQ6013788
	for <perforce@freebsd.org>; Tue, 19 Feb 2008 09:14:39 GMT
	(envelope-from thompsa@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1J9Ed2Z013785
	for perforce@freebsd.org; Tue, 19 Feb 2008 09:14:39 GMT
	(envelope-from thompsa@freebsd.org)
Date: Tue, 19 Feb 2008 09:14:39 GMT
Message-Id: <200802190914.m1J9Ed2Z013785@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 135712 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, 19 Feb 2008 09:14:40 -0000

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

Change 135712 by thompsa@thompsa_heff on 2008/02/19 09:14:13

	Fix the build.

Affected files ...

.. //depot/projects/wifi/sys/dev/wpi/if_wpi.c#11 edit

Differences ...

==== //depot/projects/wifi/sys/dev/wpi/if_wpi.c#11 (text+ko) ====

@@ -1331,7 +1331,6 @@
 	struct wpi_softc *sc = ifp->if_softc;
 	struct ieee80211_node *ni;
 	int error;
-	WPI_LOCK_DECL;
 
 	DPRINTF(("%s: %s -> %s\n", __func__,
 		 ieee80211_state_name[ic->ic_state],
@@ -3096,7 +3095,7 @@
 	struct ieee80211com *ic = &sc->sc_ic;
 	struct ifnet *ifp = ic->ic_ifp;
 	uint32_t tmp;
-	int ntries, error, qid;
+	int ntries, qid;
 	WPI_LOCK_DECL;
 
 	WPI_LOCK(sc);
@@ -3296,7 +3295,6 @@
 	struct wpi_softc *sc = arg;
 	struct ieee80211com *ic = &sc->sc_ic;
 	int temp;
-	WPI_LOCK_DECL;
 
 	if (ic->ic_state != IEEE80211_S_RUN)
 		return;