From owner-p4-projects@FreeBSD.ORG  Thu Sep  6 02:58:38 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A3AE116A419; Thu,  6 Sep 2007 02:58:38 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5DA5516A418
	for <perforce@freebsd.org>; Thu,  6 Sep 2007 02:58:38 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 4FC2F13C459
	for <perforce@freebsd.org>; Thu,  6 Sep 2007 02:58:38 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l862wc1Y045449
	for <perforce@freebsd.org>; Thu, 6 Sep 2007 02:58:38 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l862wbl5045446
	for perforce@freebsd.org; Thu, 6 Sep 2007 02:58:37 GMT
	(envelope-from kmacy@freebsd.org)
Date: Thu, 6 Sep 2007 02:58:37 GMT
Message-Id: <200709060258.l862wbl5045446@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 126116 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Thu, 06 Sep 2007 02:58:38 -0000

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

Change 126116 by kmacy@kmacy_home:ethng on 2007/09/06 02:58:03

	define cxgb_tx_common and process_responses
	fix out of memory condition for non-IFNET_MULTIQ case
	fix tx queue binding to be correct for the 4-port case

Affected files ...

.. //depot/projects/ethng/src/sys/dev/cxgb/cxgb_adapter.h#14 edit
.. //depot/projects/ethng/src/sys/dev/cxgb/cxgb_main.c#15 edit

Differences ...

==== //depot/projects/ethng/src/sys/dev/cxgb/cxgb_adapter.h#14 (text+ko) ====

@@ -590,9 +590,10 @@
     struct in6_addr *rip, uint16_t rport, int ipv6);
 void cxgb_pcpu_shutdown_threads(struct adapter *sc);
 void cxgb_pcpu_startup_threads(struct adapter *sc);
-int cxgb_tx_common(struct ifnet *ifp, struct sge_qset  *qs, uint32_t txmax);
 #endif
 
+int process_responses(adapter_t *adap, struct sge_qset *qs, int budget);
+int cxgb_tx_common(struct ifnet *ifp, struct sge_qset  *qs, uint32_t txmax);
 void t3_free_qset(adapter_t *sc, struct sge_qset *q);
 int cxgb_dequeue_packet(struct ifnet *, struct sge_txq *, struct mbuf **);
 void cxgb_start(struct ifnet *ifp);

==== //depot/projects/ethng/src/sys/dev/cxgb/cxgb_main.c#15 (text+ko) ====

@@ -1456,7 +1456,7 @@
 
 		for (j = 0; j < pi->nqsets; ++j)
 			send_pktsched_cmd(sc, 1, pi->first_qset + j, -1,
-					  -1, i);
+					  -1, pi->tx_chan);
 	}
 }
 
@@ -1998,11 +1998,11 @@
 		if (err == ENOMEM) {
 			ifp->if_drv_flags |= IFF_DRV_OACTIVE;
 			IFQ_LOCK(&ifp->if_snd);
-			IFQ_DRV_PREPEND(&ifp->if_snd, m);
+			IFQ_DRV_PREPEND(&ifp->if_snd, m_vec[0]);
 			IFQ_UNLOCK(&ifp->if_snd);
 		}
 	}
-	if (err == 0 && m == NULL) {
+	if (err == 0 && m_vec[0] == NULL) {
 		err = ENOBUFS;
 	}
 	else if ((err == 0) &&  (txq->size <= txq->in_use + TX_MAX_DESC) &&