From owner-svn-src-head@FreeBSD.ORG  Tue Jan 26 23:04:14 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 06A121065672;
	Tue, 26 Jan 2010 23:04:14 +0000 (UTC) (envelope-from jfv@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id EA6098FC14;
	Tue, 26 Jan 2010 23:04:13 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o0QN4D4g030058;
	Tue, 26 Jan 2010 23:04:13 GMT (envelope-from jfv@svn.freebsd.org)
Received: (from jfv@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0QN4D25030055;
	Tue, 26 Jan 2010 23:04:13 GMT (envelope-from jfv@svn.freebsd.org)
Message-Id: <201001262304.o0QN4D25030055@svn.freebsd.org>
From: Jack F Vogel <jfv@FreeBSD.org>
Date: Tue, 26 Jan 2010 23:04:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r203051 - head/sys/dev/e1000
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 26 Jan 2010 23:04:14 -0000

Author: jfv
Date: Tue Jan 26 23:04:13 2010
New Revision: 203051
URL: http://svn.freebsd.org/changeset/base/203051

Log:
  Missing a fix for the new watchdog handling.

Modified:
  head/sys/dev/e1000/if_em.c
  head/sys/dev/e1000/if_igb.c

Modified: head/sys/dev/e1000/if_em.c
==============================================================================
--- head/sys/dev/e1000/if_em.c	Tue Jan 26 22:38:31 2010	(r203050)
+++ head/sys/dev/e1000/if_em.c	Tue Jan 26 23:04:13 2010	(r203051)
@@ -2224,6 +2224,7 @@ em_xmit(struct adapter *adapter, struct 
 	 */
 	tx_buffer = &adapter->tx_buffer_area[first];
 	tx_buffer->next_eop = last;
+	adapter->watchdog_time = ticks;
 
 	/*
 	 * Advance the Transmit Descriptor Tail (TDT), this tells the E1000

Modified: head/sys/dev/e1000/if_igb.c
==============================================================================
--- head/sys/dev/e1000/if_igb.c	Tue Jan 26 22:38:31 2010	(r203050)
+++ head/sys/dev/e1000/if_igb.c	Tue Jan 26 23:04:13 2010	(r203051)
@@ -1645,6 +1645,7 @@ igb_xmit(struct tx_ring *txr, struct mbu
 	 */
 	tx_buffer = &txr->tx_buffers[first];
 	tx_buffer->next_eop = last;
+	txr->watchdog_time = ticks;
 
 	/*
 	 * Advance the Transmit Descriptor Tail (TDT), this tells the E1000