From owner-svn-src-user@FreeBSD.ORG Wed Aug 31 05:19:31 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 D43F21065670; Wed, 31 Aug 2011 05:19:31 +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 C3E1C8FC13; Wed, 31 Aug 2011 05:19:31 +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 p7V5JV5U082335; Wed, 31 Aug 2011 05:19:31 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p7V5JVJf082333; Wed, 31 Aug 2011 05:19:31 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201108310519.p7V5JVJf082333@svn.freebsd.org> From: Adrian Chadd Date: Wed, 31 Aug 2011 05:19:31 +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: r225280 - 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: Wed, 31 Aug 2011 05:19:31 -0000 Author: adrian Date: Wed Aug 31 05:19:31 2011 New Revision: 225280 URL: http://svn.freebsd.org/changeset/base/225280 Log: Don't clear the MRR fields for aggregate frames. This allows for faster recovery if higher MCS rates begin to fail, as lower MCS rates are now tried. There are still issues forming large aggregates because of the logic involved in selecting the largest aggregate frame size (which is based on the lowest 4ms frame length value in the rate series), but that's a later issue to solve. 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 Wed Aug 31 04:57:11 2011 (r225279) +++ user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.c Wed Aug 31 05:19:31 2011 (r225280) @@ -3202,19 +3202,6 @@ ath_tx_tid_hw_queue_aggr(struct ath_soft sc->sc_stats.tx_aggr.aggr_pkts[bf->bf_state.bfs_nframes]++; sc->sc_stats.tx_aggr.aggr_aggr_pkt++; - /* Set rate 1, 2, 3 to 0 for aggregate frames */ - bf->bf_state.bfs_rc[1].rix = - bf->bf_state.bfs_rc[2].rix = - bf->bf_state.bfs_rc[3].rix = 0; - - bf->bf_state.bfs_rc[1].ratecode = - bf->bf_state.bfs_rc[2].ratecode = - bf->bf_state.bfs_rc[3].ratecode = 0; - - bf->bf_state.bfs_rc[1].tries = - bf->bf_state.bfs_rc[2].tries = - bf->bf_state.bfs_rc[3].tries = 0; - /* * Setup the relevant descriptor fields * for aggregation. The first descriptor