From owner-svn-src-user@FreeBSD.ORG  Tue Oct 18 07:17:44 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 742A61065676;
	Tue, 18 Oct 2011 07:17:44 +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 642B38FC20;
	Tue, 18 Oct 2011 07:17:44 +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 p9I7HiD5061248;
	Tue, 18 Oct 2011 07:17:44 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9I7Hi0g061246;
	Tue, 18 Oct 2011 07:17:44 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201110180717.p9I7Hi0g061246@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Tue, 18 Oct 2011 07:17:44 +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: r226494 - 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: Tue, 18 Oct 2011 07:17:44 -0000

Author: adrian
Date: Tue Oct 18 07:17:44 2011
New Revision: 226494
URL: http://svn.freebsd.org/changeset/base/226494

Log:
  Remove a now uneeded call. This race doesn't occur (now) because
  of the ath sc lock being held during ath_rx_proc. It _can_ race
  with the tx completion code and ath_start / ath_xmit_raw calls
  because currently no sc lock is held during those.

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

Modified: user/adrian/if_ath_tx/sys/dev/ath/if_ath.c
==============================================================================
--- user/adrian/if_ath_tx/sys/dev/ath/if_ath.c	Tue Oct 18 07:13:07 2011	(r226493)
+++ user/adrian/if_ath_tx/sys/dev/ath/if_ath.c	Tue Oct 18 07:17:44 2011	(r226494)
@@ -1857,11 +1857,6 @@ ath_reset_locked(struct ifnet *ifp, ATH_
 	ath_hal_intrset(ah, 0);		/* disable interrupts */
 	ath_stoptxdma(sc);		/* stop TX side */
 	ath_draintxq(sc, reset_type);	/* drain TXQs if needed */
-	/*
-	 * XXX Don't flush if ATH_RESET_NOLOSS;but we have to first
-	 * XXX need to ensure this doesn't race with an outstanding
-	 * XXX taskqueue call.
-	 */
 	ath_stoprecv(sc);		/* stop recv side */
 	ath_rx_proc(sc, 0);		/* process RX'ed frames in the queue */
 	ath_settkipmic(sc);		/* configure TKIP MIC handling */