From owner-svn-src-user@FreeBSD.ORG  Mon Jun 13 01:30:18 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 B42C2106564A;
	Mon, 13 Jun 2011 01:30:18 +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 A4F758FC13;
	Mon, 13 Jun 2011 01:30:18 +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 p5D1UIsq049818;
	Mon, 13 Jun 2011 01:30:18 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p5D1UIQS049816;
	Mon, 13 Jun 2011 01:30:18 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201106130130.p5D1UIQS049816@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Mon, 13 Jun 2011 01:30:18 +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: r223030 - 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: Mon, 13 Jun 2011 01:30:18 -0000

Author: adrian
Date: Mon Jun 13 01:30:18 2011
New Revision: 223030
URL: http://svn.freebsd.org/changeset/base/223030

Log:
  Fix another LOR.

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

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	Mon Jun 13 01:04:00 2011	(r223029)
+++ user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.c	Mon Jun 13 01:30:18 2011	(r223030)
@@ -1451,11 +1451,11 @@ ath_tx_tid_cleanup(struct ath_softc *sc,
 		ath_tx_tid_txq_unmark(sc, an, i);
 
 		/* Remove any pending hardware TXQ scheduling */
-		ATH_NODE_LOCK(an);
 		ATH_TXNODE_LOCK(sc);
+		ATH_NODE_LOCK(an);
 		ath_tx_node_unsched(sc, an);
-		ATH_TXNODE_UNLOCK(sc);
 		ATH_NODE_UNLOCK(an);
+		ATH_TXNODE_UNLOCK(sc);
 
 		/* Free mutex */
 		mtx_destroy(&atid->axq_lock);