From owner-svn-src-user@FreeBSD.ORG  Thu Jun 18 04:42:48 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
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 01C4D106566B;
	Thu, 18 Jun 2009 04:42:48 +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 E4C458FC14;
	Thu, 18 Jun 2009 04:42:47 +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 n5I4glbQ097799;
	Thu, 18 Jun 2009 04:42:47 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5I4glV9097797;
	Thu, 18 Jun 2009 04:42:47 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200906180442.n5I4glV9097797@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Thu, 18 Jun 2009 04:42:47 +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: r194413 - 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 &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 18 Jun 2009 04:42:48 -0000

Author: kmacy
Date: Thu Jun 18 04:42:47 2009
New Revision: 194413
URL: http://svn.freebsd.org/changeset/base/194413

Log:
  validate link before trying to send packets

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	Thu Jun 18 02:51:43 2009	(r194412)
+++ user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_sge.c	Thu Jun 18 04:42:47 2009	(r194413)
@@ -1645,7 +1645,10 @@ cxgb_start_locked(struct sge_qset *qs)
 
 	if (qs->qs_flags & (QS_FLUSHING|QS_TIMEOUT))
 		reclaim_completed_tx(qs, 0, TXQ_ETH);
-		
+
+	if (!pi->link_config.link_ok)
+		return;
+
 	TXQ_LOCK_ASSERT(qs);
 	while ((txq->in_use - in_use_init < txmax) &&
 	    !TXQ_RING_EMPTY(qs) &&
@@ -1674,7 +1677,8 @@ cxgb_start_locked(struct sge_qset *qs)
 
 		m_head = NULL;
 	}
-	if (!TXQ_RING_EMPTY(qs) && callout_pending(&txq->txq_timer) == 0)
+	if (!TXQ_RING_EMPTY(qs) && callout_pending(&txq->txq_timer) == 0 &&
+	    pi->link_config.link_ok)
 		callout_reset_on(&txq->txq_timer, 1, cxgb_tx_timeout,
 		    qs, txq->txq_timer.c_cpu);
 	if (m_head != NULL)
@@ -1745,7 +1749,8 @@ cxgb_transmit(struct ifnet *ifp, struct 
 	struct port_info *pi = ifp->if_softc;
 	int error, qidx = pi->first_qset;
 
-	if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) {
+	if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0
+	    ||(!pi->link_config.link_ok)) {
 		m_freem(m);
 		return (0);
 	}