From owner-svn-src-user@FreeBSD.ORG Sun Aug 14 11:47: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 DE5981065679; Sun, 14 Aug 2011 11:47: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 B4B988FC19; Sun, 14 Aug 2011 11:47: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 p7EBlgqj062899; Sun, 14 Aug 2011 11:47:42 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p7EBlgPb062896; Sun, 14 Aug 2011 11:47:42 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201108141147.p7EBlgPb062896@svn.freebsd.org> From: Adrian Chadd Date: Sun, 14 Aug 2011 11:47: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: r224861 - 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: Sun, 14 Aug 2011 11:47:43 -0000 Author: adrian Date: Sun Aug 14 11:47:42 2011 New Revision: 224861 URL: http://svn.freebsd.org/changeset/base/224861 Log: Add the 4ms framelength maximum values. This'll be eventually used by the aggregation logic to determine how long the maximum frame length will be at the selected rate control. Modified: user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx_ht.c user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx_ht.h Modified: user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx_ht.c ============================================================================== --- user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx_ht.c Sun Aug 14 00:55:18 2011 (r224860) +++ user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx_ht.c Sun Aug 14 11:47:42 2011 (r224861) @@ -88,6 +88,33 @@ __FBSDID("$FreeBSD$"); #include +int ath_max_4ms_framelen[4][32] = { + [MCS_HT20] = { + 3212, 6432, 9648, 12864, 19300, 25736, 28952, 32172, + 6424, 12852, 19280, 25708, 38568, 51424, 57852, 64280, + 9628, 19260, 28896, 38528, 57792, 65532, 65532, 65532, + 12828, 25656, 38488, 51320, 65532, 65532, 65532, 65532, + }, + [MCS_HT20_SGI] = { + 3572, 7144, 10720, 14296, 21444, 28596, 32172, 35744, + 7140, 14284, 21428, 28568, 42856, 57144, 64288, 65532, + 10700, 21408, 32112, 42816, 64228, 65532, 65532, 65532, + 14256, 28516, 42780, 57040, 65532, 65532, 65532, 65532, + }, + [MCS_HT40] = { + 6680, 13360, 20044, 26724, 40092, 53456, 60140, 65532, + 13348, 26700, 40052, 53400, 65532, 65532, 65532, 65532, + 20004, 40008, 60016, 65532, 65532, 65532, 65532, 65532, + 26644, 53292, 65532, 65532, 65532, 65532, 65532, 65532, + }, + [MCS_HT40_SGI] = { + 7420, 14844, 22272, 29696, 44544, 59396, 65532, 65532, + 14832, 29668, 44504, 59340, 65532, 65532, 65532, 65532, + 22232, 44464, 65532, 65532, 65532, 65532, 65532, 65532, + 29616, 59232, 65532, 65532, 65532, 65532, 65532, 65532, + } +}; + /* * Setup a 11n rate series structure * Modified: user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx_ht.h ============================================================================== --- user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx_ht.h Sun Aug 14 00:55:18 2011 (r224860) +++ user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx_ht.h Sun Aug 14 11:47:42 2011 (r224861) @@ -31,6 +31,15 @@ #ifndef __IF_ATH_TX_HT_H__ #define __IF_ATH_TX_HT_H__ +enum { + MCS_HT20, + MCS_HT20_SGI, + MCS_HT40, + MCS_HT40_SGI, +}; + +extern int ath_max_4ms_framelen[4][32]; + extern void ath_buf_set_rate(struct ath_softc *sc, struct ieee80211_node *ni, struct ath_buf *bf, int pktlen, int flags, uint8_t ctsrate, int is_pspoll,