From owner-svn-src-user@FreeBSD.ORG Thu Aug 18 04:44:42 2011 Return-Path: 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 4D495106564A; Thu, 18 Aug 2011 04:44:42 +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 3DE238FC19; Thu, 18 Aug 2011 04:44:42 +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 p7I4igRj037201; Thu, 18 Aug 2011 04:44:42 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p7I4igag037199; Thu, 18 Aug 2011 04:44:42 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201108180444.p7I4igag037199@svn.freebsd.org> From: Adrian Chadd Date: Thu, 18 Aug 2011 04:44:42 +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: r224958 - 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" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Aug 2011 04:44:42 -0000 Author: adrian Date: Thu Aug 18 04:44:41 2011 New Revision: 224958 URL: http://svn.freebsd.org/changeset/base/224958 Log: Whilst auditing the code, I've found that my shuffling of ATH_BUF_BUSY handling is incorrect. Since this'll break the TDMA code (and I'd rather not do that), just leave a note for it to be revisited before this is merged back into -HEAD. 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 Thu Aug 18 04:39:29 2011 (r224957) +++ user/adrian/if_ath_tx/sys/dev/ath/if_ath.c Thu Aug 18 04:44:41 2011 (r224958) @@ -4425,6 +4425,11 @@ ath_tx_freebuf(struct ath_softc *sc, str } m_freem(bf->bf_m); bf->bf_m = NULL; + + /* + * XXX This is incorrect. Check what the -HEAD code is doing. + * XXX The TDMA code will be broken if this isn't properly repaired. + */ bf->bf_flags &= ~ATH_BUF_BUSY; ATH_TXBUF_LOCK(sc);