From owner-svn-src-head@FreeBSD.ORG  Thu Jun 14 04:24:14 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 2FE0E106564A;
	Thu, 14 Jun 2012 04:24:14 +0000 (UTC)
	(envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [69.147.83.44])
	by mx1.freebsd.org (Postfix) with ESMTP id 1A6D88FC08;
	Thu, 14 Jun 2012 04:24: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 q5E4ODef069326;
	Thu, 14 Jun 2012 04:24:13 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5E4ODMB069324;
	Thu, 14 Jun 2012 04:24:13 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201206140424.q5E4ODMB069324@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Thu, 14 Jun 2012 04:24:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r237046 - head/sys/dev/ath
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 14 Jun 2012 04:24:14 -0000

Author: adrian
Date: Thu Jun 14 04:24:13 2012
New Revision: 237046
URL: http://svn.freebsd.org/changeset/base/237046

Log:
  Shrink ath_buf a little more:
  
  * Resize some types.  In particular, bfs_seqno can be uint16_t for now.
    Previous work would assign the unassigned seqno a value of -1, which
    I obviously can't do here.
  
  * Remove bfs_pktdur.  It was in the original code but nothing so far uses
    it.
  
  This gets ath_buf down (on my i386 system) to 292 bytes from 300 bytes.
  I'd rather it be much, much smaller.

Modified:
  head/sys/dev/ath/if_athvar.h

Modified: head/sys/dev/ath/if_athvar.h
==============================================================================
--- head/sys/dev/ath/if_athvar.h	Thu Jun 14 04:18:56 2012	(r237045)
+++ head/sys/dev/ath/if_athvar.h	Thu Jun 14 04:24:13 2012	(r237046)
@@ -211,15 +211,16 @@ struct ath_buf {
 
 	/* This state is kept to support software retries and aggregation */
 	struct {
-		int bfs_seqno;		/* sequence number of this packet */
-		int bfs_retries;	/* retry count */
-		uint16_t bfs_tid;	/* packet TID (or TID_MAX for no QoS) */
-		uint16_t bfs_pri;	/* packet AC priority */
-		struct ath_txq *bfs_txq;	/* eventual dest hardware TXQ */
-		uint16_t bfs_pktdur;	/* packet duration (at current rate?) */
-		uint16_t bfs_nframes;	/* number of frames in aggregate */
+		uint16_t bfs_seqno;	/* sequence number of this packet */
 		uint16_t bfs_ndelim;	/* number of delims for padding */
 
+		uint8_t bfs_retries;	/* retry count */
+		uint8_t bfs_tid;	/* packet TID (or TID_MAX for no QoS) */
+		uint8_t bfs_nframes;	/* number of frames in aggregate */
+		uint8_t bfs_pri;	/* packet AC priority */
+
+		struct ath_txq *bfs_txq;	/* eventual dest hardware TXQ */
+
 		u_int32_t bfs_aggr:1,		/* part of aggregate? */
 		    bfs_aggrburst:1,	/* part of aggregate burst? */
 		    bfs_isretried:1,	/* retried frame? */