From owner-p4-projects@FreeBSD.ORG  Mon Feb 18 22:21:46 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EDD6216A420; Mon, 18 Feb 2008 22:21:45 +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 B1E6616A41A
	for <perforce@freebsd.org>; Mon, 18 Feb 2008 22:21:45 +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 A7C4013C442
	for <perforce@freebsd.org>; Mon, 18 Feb 2008 22:21:45 +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 m1IMLjDY098092
	for <perforce@freebsd.org>; Mon, 18 Feb 2008 22:21:45 GMT
	(envelope-from thompsa@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1IMLjdK098089
	for perforce@freebsd.org; Mon, 18 Feb 2008 22:21:45 GMT
	(envelope-from thompsa@freebsd.org)
Date: Mon, 18 Feb 2008 22:21:45 GMT
Message-Id: <200802182221.m1IMLjdK098089@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 135681 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: Mon, 18 Feb 2008 22:21:46 -0000

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

Change 135681 by thompsa@thompsa_heff on 2008/02/18 22:20:57

	Remove the mbuf from the send queue early on as ieee80211_cancel_scan()
	will reenter wpi_start causing the mbuf to be sent and disappear from
	the queue.

Affected files ...

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

Differences ...

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

@@ -2196,7 +2196,7 @@
 			if (ic->ic_state != IEEE80211_S_RUN)
 				break;
 
-			IFQ_POLL(&ifp->if_snd, m0);
+			IFQ_DRV_DEQUEUE(&ifp->if_snd, m0);
 			if (m0 == NULL)
 				break;
 
@@ -2238,7 +2238,6 @@
 				break;
 			}
 
-			IFQ_DRV_DEQUEUE(&ifp->if_snd, m0);
 			BPF_MTAP(ifp, m0);
 
 			m0 = ieee80211_encap(ic, m0, ni);