From owner-svn-src-user@FreeBSD.ORG Wed Jun 3 01:13:12 2009 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 D80AB106566B; Wed, 3 Jun 2009 01:13:12 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C686D8FC17; Wed, 3 Jun 2009 01:13:12 +0000 (UTC) (envelope-from kmacy@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 n531DCdZ034105; Wed, 3 Jun 2009 01:13:12 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n531DCU6034104; Wed, 3 Jun 2009 01:13:12 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200906030113.n531DCU6034104@svn.freebsd.org> From: Kip Macy Date: Wed, 3 Jun 2009 01:13:12 +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: r193361 - user/kmacy/releng_7_2_fcs/sys/dev/cxgb 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, 03 Jun 2009 01:13:13 -0000 Author: kmacy Date: Wed Jun 3 01:13:12 2009 New Revision: 193361 URL: http://svn.freebsd.org/changeset/base/193361 Log: eliminate header_size deduction from mbuf Modified: user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_sge.c Modified: user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_sge.c ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_sge.c Wed Jun 3 01:06:21 2009 (r193360) +++ user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_sge.c Wed Jun 3 01:13:12 2009 (r193361) @@ -2385,7 +2385,7 @@ t3_sge_alloc_qset(adapter_t *sc, u_int i const struct qset_params *p, int ntxq, struct port_info *pi) { struct sge_qset *q = &sc->sge.qs[id]; - int i, header_size, ret = 0; + int i, ret = 0; for (i = 0; i < SGE_TXQ_PER_SET; i++) { @@ -2470,26 +2470,24 @@ t3_sge_alloc_qset(adapter_t *sc, u_int i q->rspq.cidx = 0; q->rspq.size = p->rspq_size; - - header_size = sizeof(struct mbuf) + sizeof(uint32_t); q->txq[TXQ_ETH].stop_thres = nports * flits_to_desc(sgl_len(TX_MAX_SEGS + 1) + 3); - q->fl[0].buf_size = (MCLBYTES - header_size); + q->fl[0].buf_size = MCLBYTES; q->fl[0].zone = zone_clust; q->fl[0].type = EXT_CLUSTER; #if __FreeBSD_version > 800000 if (cxgb_use_16k_clusters) { - q->fl[1].buf_size = MJUM16BYTES - header_size; + q->fl[1].buf_size = MJUM16BYTES; q->fl[1].zone = zone_jumbo16; q->fl[1].type = EXT_JUMBO16; } else { - q->fl[1].buf_size = MJUM9BYTES - header_size; + q->fl[1].buf_size = MJUM9BYTES; q->fl[1].zone = zone_jumbo9; q->fl[1].type = EXT_JUMBO9; } #else - q->fl[1].buf_size = MJUMPAGESIZE - header_size; + q->fl[1].buf_size = MJUMPAGESIZE; q->fl[1].zone = zone_jumbop; q->fl[1].type = EXT_JUMBOP; #endif