From owner-svn-src-user@FreeBSD.ORG Wed Aug 17 09:40:53 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 5CEF01065672; Wed, 17 Aug 2011 09:40:53 +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 33F888FC18; Wed, 17 Aug 2011 09:40:53 +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 p7H9eruh096476; Wed, 17 Aug 2011 09:40:53 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p7H9erh9096472; Wed, 17 Aug 2011 09:40:53 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201108170940.p7H9erh9096472@svn.freebsd.org> From: Adrian Chadd Date: Wed, 17 Aug 2011 09:40:53 +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: r224932 - in user/adrian/if_ath_tx/sys/dev/ath/ath_hal: . ar5416 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, 17 Aug 2011 09:40:53 -0000 Author: adrian Date: Wed Aug 17 09:40:52 2011 New Revision: 224932 URL: http://svn.freebsd.org/changeset/base/224932 Log: Extract out the TID field from the TX completion status. Obtained from: Linux ath9k Modified: user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ah_desc.h user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar5416/ar5416desc.h Modified: user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ah_desc.h ============================================================================== --- user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ah_desc.h Wed Aug 17 09:06:05 2011 (r224931) +++ user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ah_desc.h Wed Aug 17 09:40:52 2011 (r224932) @@ -50,6 +50,7 @@ struct ath_tx_status { /* #define ts_rssi ts_rssi_combined */ uint32_t ts_ba_low; /* blockack bitmap low */ uint32_t ts_ba_high; /* blockack bitmap high */ + uint8_t ts_tid; /* TID */ uint32_t ts_evm0; /* evm bytes */ uint32_t ts_evm1; uint32_t ts_evm2; Modified: user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c ============================================================================== --- user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c Wed Aug 17 09:06:05 2011 (r224931) +++ user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c Wed Aug 17 09:40:52 2011 (r224932) @@ -504,6 +504,7 @@ ar5416ProcTxDesc(struct ath_hal *ah, /* Update software copies of the HW status */ ts->ts_seqnum = MS(ds_txstatus[9], AR_SeqNum); ts->ts_tstamp = AR_SendTimestamp(ds_txstatus); + ts->ts_tid = MS(ds_txstatus[9], AR_TxTid); ts->ts_status = 0; if (ds_txstatus[1] & AR_ExcessiveRetries) Modified: user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar5416/ar5416desc.h ============================================================================== --- user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar5416/ar5416desc.h Wed Aug 17 09:06:05 2011 (r224931) +++ user/adrian/if_ath_tx/sys/dev/ath/ath_hal/ar5416/ar5416desc.h Wed Aug 17 09:40:52 2011 (r224932) @@ -302,6 +302,8 @@ struct ar5416_desc { #define AR_FinalTxIdx_S 21 #define AR_TxStatusRsvd82 0x01800000 #define AR_PowerMgmt 0x02000000 +#define AR_TxTid 0xf0000000 +#define AR_TxTid_S 28 #define AR_TxStatusRsvd83 0xfc000000 /***********