From owner-p4-projects@FreeBSD.ORG  Sat Jun 23 00:04:05 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 01D5716A46F; Sat, 23 Jun 2007 00:04:05 +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 48CD716A468
	for <perforce@freebsd.org>; Sat, 23 Jun 2007 00:04:04 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 37CBE13C44C
	for <perforce@freebsd.org>; Sat, 23 Jun 2007 00:04:03 +0000 (UTC)
	(envelope-from sam@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 l5N042QZ054830
	for <perforce@freebsd.org>; Sat, 23 Jun 2007 00:04:02 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5N042wR054827
	for perforce@freebsd.org; Sat, 23 Jun 2007 00:04:02 GMT
	(envelope-from sam@freebsd.org)
Date: Sat, 23 Jun 2007 00:04:02 GMT
Message-Id: <200706230004.l5N042wR054827@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 122172 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: Sat, 23 Jun 2007 00:04:05 -0000

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

Change 122172 by sam@sam_aku on 2007/06/23 00:03:42

	process tx callbacks when draining the tx q; this fixes
	a problem where a device timeout that occurs with a mgt
	frame on the tx q will leave the net80211 layer w/o any
	way to make progress

Affected files ...

.. //depot/projects/wifi/sys/dev/ath/if_ath.c#146 edit

Differences ...

==== //depot/projects/wifi/sys/dev/ath/if_ath.c#146 (text+ko) ====

@@ -4865,8 +4865,10 @@
 		bf->bf_node = NULL;
 		if (ni != NULL) {
 			/*
-			 * Reclaim node reference.
+			 * Do any callback and reclaim the node reference.
 			 */
+			if (bf->bf_m->m_flags & M_TXCB)
+				ieee80211_process_callback(ni, bf->bf_m, -1);
 			ieee80211_free_node(ni);
 		}
 		m_freem(bf->bf_m);