From owner-svn-src-user@FreeBSD.ORG Wed Oct 19 08:52:14 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 E1CDF106566C;
Wed, 19 Oct 2011 08:52:14 +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 D264A8FC0C;
Wed, 19 Oct 2011 08:52:14 +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 p9J8qE3U012778;
Wed, 19 Oct 2011 08:52:14 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9J8qE5v012776;
Wed, 19 Oct 2011 08:52:14 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201110190852.p9J8qE5v012776@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Wed, 19 Oct 2011 08:52:14 +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: r226529 - 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 " user"
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: Wed, 19 Oct 2011 08:52:15 -0000
Author: adrian
Date: Wed Oct 19 08:52:14 2011
New Revision: 226529
URL: http://svn.freebsd.org/changeset/base/226529
Log:
Remove unneeded code and comment. The race has been fixed
by placing the relevant bits behind ATH_LOCK.
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 Wed Oct 19 08:39:44 2011 (r226528)
+++ user/adrian/if_ath_tx/sys/dev/ath/if_ath.c Wed Oct 19 08:52:14 2011 (r226529)
@@ -4130,38 +4130,11 @@ rx_next:
* need to be handled, kick the PCU if there's
* been an RXEOL condition.
*/
- /*
- * XXX TODO!
- * It is very likely that we're unfortunately
- * racing with other places where ath_hal_intrset()
- * may be called. It may be that we do need to
- * add some more locking (eg the pcu lock from ath9k/
- * reference), or introduce some other way to cope
- * with this.
- */
if (resched && sc->sc_kickpcu) {
CTR0(ATH_KTR_ERR, "ath_rx_proc: kickpcu");
device_printf(sc->sc_dev, "%s: kickpcu; handled %d packets\n",
__func__, npkts);
-#if 0
- /*
- * This re-links all of the descriptors together.
- * (Is it possible that somehow, some state/issue
- * is leaving us with badly linked descriptors?)
- * Is it possible that we're receiving another RXEOL
- * _during_ this function?
- */
- if (ath_startrecv(sc) != 0) {
- if_printf(ifp,
- "%s: couldn't restart RX after RXEOL; resetting\n",
- __func__);
- ath_reset(ifp);
- sc->sc_kickpcu = 0;
- return;
- }
-#endif
-
/* XXX rxslink? */
bf = TAILQ_FIRST(&sc->sc_rxbuf);
ath_hal_putrxbuf(ah, bf->bf_daddr);