From 37379260936da1e9c4ad6e25149ea84ba6d5bf0e Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Sat, 28 Sep 1996 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 1996-09-28

---
 pc/clock.c      | 2 ++
 pc/etherelnk3.c | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pc/clock.c b/pc/clock.c
index 9b299f7efbf94aa33853dba4e2abcc3199143d1d..a99723662ec3b59c9a195db74ec4c0b5f2c10160 100644
--- a/pc/clock.c
+++ b/pc/clock.c
@@ -93,11 +93,13 @@ X86type x86type[] =
 	{ 4,	8,	22,	"IntelDX4", },
 	{ 5,	1,	23,	"Pentium510", },
 	{ 5,	2,	23,	"Pentium735", },
+	{ 6,	1,	16,	"PentiumPro", },/* determined by trial and error */
 
 	/* family defaults */
 	{ 3,	-1,	32,	"Intel386", },
 	{ 4,	-1,	22,	"Intel486", },
 	{ 5,	-1,	23,	"Pentium", },
+	{ 6,	-1,	16,	"PentiumPro", },
 
 	/* total default */
 	{ -1,	-1,	23,	"unknown", },
diff --git a/pc/etherelnk3.c b/pc/etherelnk3.c
index 72876c01e3e7d0c4793c023d3ef9d68b786e8d42..af1d356c89d984bf16f080b1c1e26f0de69d4f99 100644
--- a/pc/etherelnk3.c
+++ b/pc/etherelnk3.c
@@ -722,7 +722,7 @@ interrupt(Ureg*, void* arg)
 			}
 
 			if(txstatus & (txJabber|txUnderrun)){
-				COMMAND(port, TxReset, 0);
+				COMMAND(port, TxReset, dmaReset);
 				while(STATUS(port) & commandInProgress)
 					;
 				COMMAND(port, SetTxStartThresh, ctlr->txthreshold>>ctlr->ts);
@@ -1219,8 +1219,8 @@ etherelnk3reset(Ether* ether)
 	 * if any txUnderrun errors occur and ensure no RxEarly
 	 * interrupts happen.
 	 */
-	ctlr->txthreshold = ETHERMINTU;
-	COMMAND(port, SetTxStartThresh, ETHERMINTU>>ctlr->ts);
+	ctlr->txthreshold = ETHERMINTU*2;
+	COMMAND(port, SetTxStartThresh, ctlr->txthreshold>>ctlr->ts);
 	COMMAND(port, SetRxEarlyThresh, rxearly>>ctlr->ts);
 
 	iunlock(&ctlr->wlock);