Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 26 Jan 2010 23:04:13 +0000 (UTC)
From:      Jack F Vogel <jfv@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r203051 - head/sys/dev/e1000
Message-ID:  <201001262304.o0QN4D25030055@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201001262304.o0QN4D25030055>