From owner-svn-src-user@FreeBSD.ORG  Sun Jun 12 10:14:35 2011
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8354C106566C;
	Sun, 12 Jun 2011 10:14:35 +0000 (UTC)
	(envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 743598FC20;
	Sun, 12 Jun 2011 10:14:35 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p5CAEZ0H018310;
	Sun, 12 Jun 2011 10:14:35 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p5CAEZOm018307;
	Sun, 12 Jun 2011 10:14:35 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201106121014.p5CAEZOm018307@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Sun, 12 Jun 2011 10:14:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r223006 - user/adrian/if_ath_tx/sys/dev/ath
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 12 Jun 2011 10:14:35 -0000

Author: adrian
Date: Sun Jun 12 10:14:35 2011
New Revision: 223006
URL: http://svn.freebsd.org/changeset/base/223006

Log:
  * don't worry about logging the lack of comlock for now; I'll dig deeper
    soon
  * Don't hold the txq lock whilst freeing buffers; mirror what's done
    elsewhere when manipulating the txq.

Modified:
  user/adrian/if_ath_tx/sys/dev/ath/if_ath.c
  user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.c

Modified: user/adrian/if_ath_tx/sys/dev/ath/if_ath.c
==============================================================================
--- user/adrian/if_ath_tx/sys/dev/ath/if_ath.c	Sun Jun 12 10:13:48 2011	(r223005)
+++ user/adrian/if_ath_tx/sys/dev/ath/if_ath.c	Sun Jun 12 10:14:35 2011	(r223006)
@@ -5771,12 +5771,14 @@ ath_sc_flushtxq(struct ath_softc *sc)
 {
 	struct ieee80211com *ic = sc->sc_ifp->if_l2com;
 
+#if 0
 	//IEEE80211_LOCK_ASSERT(ic);
 	/* Debug if we don't own the lock! */
 	if (! mtx_owned(IEEE80211_LOCK_OBJ(ic))) {
 		device_printf(sc->sc_dev, "%s: comlock not owned?\n",
 		    __func__);
 	}
+#endif
 
 	ieee80211_iterate_nodes(&ic->ic_sta, ath_vap_flush_node, sc);
 }

Modified: user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.c
==============================================================================
--- user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.c	Sun Jun 12 10:13:48 2011	(r223005)
+++ user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.c	Sun Jun 12 10:14:35 2011	(r223006)
@@ -1385,15 +1385,17 @@ ath_tx_tid_free_pkts(struct ath_softc *s
 
 
 	/* Walk the queue, free frames */
-	ATH_TXQ_LOCK(atid);
 	for (;;) {
-	bf = STAILQ_FIRST(&atid->axq_q);
-		if (bf == NULL)
+		ATH_TXQ_LOCK(atid);
+		bf = STAILQ_FIRST(&atid->axq_q);
+		if (bf == NULL) {
+			ATH_TXQ_UNLOCK(atid);
 			break;
+		}
 		ATH_TXQ_REMOVE_HEAD(atid, bf_list);
+		ATH_TXQ_UNLOCK(atid);
 		ath_tx_buf_drainone(sc, bf);
 	}
-	ATH_TXQ_UNLOCK(atid);
 }
 
 /*