From owner-p4-projects@FreeBSD.ORG  Tue Feb  5 06:54:31 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0899616A420; Tue,  5 Feb 2008 06:54:31 +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 C250916A417
	for <perforce@freebsd.org>; Tue,  5 Feb 2008 06:54:30 +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 B4AAC13C442
	for <perforce@freebsd.org>; Tue,  5 Feb 2008 06:54:30 +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 m156sUGK003956
	for <perforce@freebsd.org>; Tue, 5 Feb 2008 06:54:30 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m156sUWj003953
	for perforce@freebsd.org; Tue, 5 Feb 2008 06:54:30 GMT
	(envelope-from kmacy@freebsd.org)
Date: Tue, 5 Feb 2008 06:54:30 GMT
Message-Id: <200802050654.m156sUWj003953@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 134824 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: Tue, 05 Feb 2008 06:54:31 -0000

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

Change 134824 by kmacy@kmacy:storage:toehead on 2008/02/05 06:53:46

	don't proceed with tx if the intorface isn't up or the driver isn't running

Affected files ...

.. //depot/projects/toehead/sys/dev/cxgb/cxgb_multiq.c#2 edit

Differences ...

==== //depot/projects/toehead/sys/dev/cxgb/cxgb_multiq.c#2 (text+ko) ====

@@ -422,13 +422,16 @@
 	txq = &qs->txq[TXQ_ETH];
 	
 	mtx_assert(&txq->lock, MA_OWNED);
-	KASSERT(qs->idx == 0, ("invalid qs %d", qs->idx));
 	
  retry:	
 	if (!pi->link_config.link_ok)
 		initerr = ENXIO;
 	else if (qs->qs_flags & QS_EXITING)
 		initerr = ENXIO;
+	else if ((pi->ifp->if_drv_flags & IFF_DRV_RUNNING) == 0)
+		initerr = ENXIO;
+	else if ((pi->ifp->if_flags & IFF_UP) == 0)
+		initerr = ENXIO;
 	else if (immpkt) {
 
 		if (!buf_ring_empty(&txq->txq_mr))