From owner-p4-projects@FreeBSD.ORG  Mon Jan 10 17:47:52 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8323616A4D0; Mon, 10 Jan 2005 17:47:52 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 5E85516A4CE
	for <perforce@freebsd.org>; Mon, 10 Jan 2005 17:47:52 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4D5EC43D54
	for <perforce@freebsd.org>; Mon, 10 Jan 2005 17:47:52 +0000 (GMT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j0AHlqHI095695
	for <perforce@freebsd.org>; Mon, 10 Jan 2005 17:47:52 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0AHlqHr095692
	for perforce@freebsd.org; Mon, 10 Jan 2005 17:47:52 GMT
	(envelope-from sam@freebsd.org)
Date: Mon, 10 Jan 2005 17:47:52 GMT
Message-Id: <200501101747.j0AHlqHr095692@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 68656 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 Jan 2005 17:47:53 -0000

http://perforce.freebsd.org/chv.cgi?CH=68656

Change 68656 by sam@sam_ebb on 2005/01/10 17:46:53

	o bump tx descriptor count to avoid defrag'ing fast frames
	o correct max s/g count; it can never be more than the
	  max(rx,tx,beacon) descriptor counts

Affected files ...

.. //depot/projects/wifi/sys/dev/ath/if_athvar.h#27 edit

Differences ...

==== //depot/projects/wifi/sys/dev/ath/if_athvar.h#27 (text+ko) ====

@@ -53,7 +53,7 @@
 
 #define	ATH_RXBUF	40		/* number of RX buffers */
 #define	ATH_TXBUF	100		/* number of TX buffers */
-#define	ATH_TXDESC	8		/* number of descriptors per buffer */
+#define	ATH_TXDESC	10		/* number of descriptors per buffer */
 #define	ATH_TXMAXTRY	11		/* max number of transmit attempts */
 #define	ATH_TXINTR_PERIOD 5		/* max number of batched tx descriptors */
 
@@ -98,7 +98,7 @@
 	struct mbuf		*bf_m;		/* mbuf for buf */
 	struct ieee80211_node	*bf_node;	/* pointer to the node */
 	bus_size_t		bf_mapsize;
-#define	ATH_MAX_SCATTER		64
+#define	ATH_MAX_SCATTER		ATH_TXDESC	/* max(tx,rx,beacon) desc's */
 	bus_dma_segment_t	bf_segs[ATH_MAX_SCATTER];
 };
 typedef STAILQ_HEAD(, ath_buf) ath_bufhead;