From owner-svn-src-stable@FreeBSD.ORG  Wed Jul  1 17:50:59 2009
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8833E10656CA;
	Wed,  1 Jul 2009 17:50:59 +0000 (UTC) (envelope-from np@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 75BBF8FC1D;
	Wed,  1 Jul 2009 17:50:59 +0000 (UTC) (envelope-from np@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n61Hox4u019740;
	Wed, 1 Jul 2009 17:50:59 GMT (envelope-from np@svn.freebsd.org)
Received: (from np@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n61HoxPr019738;
	Wed, 1 Jul 2009 17:50:59 GMT (envelope-from np@svn.freebsd.org)
Message-Id: <200907011750.n61HoxPr019738@svn.freebsd.org>
From: Navdeep Parhar <np@FreeBSD.org>
Date: Wed, 1 Jul 2009 17:50:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r195250 - stable/7/sys/dev/cxgb
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Jul 2009 17:51:00 -0000

Author: np
Date: Wed Jul  1 17:50:59 2009
New Revision: 195250
URL: http://svn.freebsd.org/changeset/base/195250

Log:
  Fix cxgb's version checks in stable.  This makes it select the
  correct buffer size for freelist1.
  
  Approved by:	gnn (mentor)

Modified:
  stable/7/sys/dev/cxgb/cxgb_sge.c

Modified: stable/7/sys/dev/cxgb/cxgb_sge.c
==============================================================================
--- stable/7/sys/dev/cxgb/cxgb_sge.c	Wed Jul  1 17:20:07 2009	(r195249)
+++ stable/7/sys/dev/cxgb/cxgb_sge.c	Wed Jul  1 17:50:59 2009	(r195250)
@@ -375,7 +375,7 @@ t3_sge_prep(adapter_t *adap, struct sge_
 
 	while (!powerof2(fl_q_size))
 		fl_q_size--;
-#if __FreeBSD_version > 700000
+#if __FreeBSD_version >= 700111
 	if (cxgb_use_16k_clusters) 
 		jumbo_q_size = min(nmbjumbo16/(3*nqsets), JUMBO_Q_SIZE);
 	else
@@ -2377,7 +2377,7 @@ t3_sge_alloc_qset(adapter_t *sc, u_int i
 	q->fl[0].buf_size = (MCLBYTES - header_size);
 	q->fl[0].zone = zone_clust;
 	q->fl[0].type = EXT_CLUSTER;
-#if __FreeBSD_version > 800000
+#if __FreeBSD_version >= 700111
 	if (cxgb_use_16k_clusters) {		
 		q->fl[1].buf_size = MJUM16BYTES - header_size;
 		q->fl[1].zone = zone_jumbo16;