svn commit: r226494 - user/adrian/if_ath_tx/sys/dev/ath

Adrian Chadd adrian at FreeBSD.org
Tue Oct 18 07:17:44 UTC 2011


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 */


More information about the svn-src-user mailing list