From 17f2ad42948c5009a6d11d4563b0c327281c36f8 Mon Sep 17 00:00:00 2001 From: Jesse Huang Date: Fri, 20 Oct 2006 14:42:05 -0700 Subject: [PATCH] --- yaml --- r: 41503 b: refs/heads/master c: e242040df1da94a9a3daa98ea5539e2b52502bb4 h: refs/heads/master i: 41501: d203215455f7553cea11b836da60ab77ddd15698 41499: f4572c70e23796e725e03cc87cf2745cc1e52774 41495: e13d9cdeb722eee87cea5d97654da815d0acbe1d 41487: 7c1d8b4e361582ed9f98b36082eb2302dbeb2da5 41471: 8672d418fa543721992796f417ca025975cb169c v: v3 --- [refs] | 2 +- trunk/drivers/net/sundance.c | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 180f7b477550..bbe592d7ace4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ac7468e923278cdcb202f8aa992d8f2776f8344c +refs/heads/master: e242040df1da94a9a3daa98ea5539e2b52502bb4 diff --git a/trunk/drivers/net/sundance.c b/trunk/drivers/net/sundance.c index 41c503d8bac4..be1faa020392 100644 --- a/trunk/drivers/net/sundance.c +++ b/trunk/drivers/net/sundance.c @@ -264,8 +264,6 @@ enum alta_offsets { ASICCtrl = 0x30, EEData = 0x34, EECtrl = 0x36, - TxStartThresh = 0x3c, - RxEarlyThresh = 0x3e, FlashAddr = 0x40, FlashData = 0x44, TxStatus = 0x46, @@ -1111,6 +1109,7 @@ static irqreturn_t intr_handler(int irq, void *dev_instance) int tx_cnt; int tx_status; int handled = 0; + int i; do { @@ -1153,17 +1152,14 @@ static irqreturn_t intr_handler(int irq, void *dev_instance) np->stats.tx_fifo_errors++; if (tx_status & 0x02) np->stats.tx_window_errors++; + /* ** This reset has been verified on ** DFE-580TX boards ! phdm@macqel.be. */ if (tx_status & 0x10) { /* TxUnderrun */ - unsigned short txthreshold; - - txthreshold = ioread16 (ioaddr + TxStartThresh); /* Restart Tx FIFO and transmitter */ sundance_reset(dev, (NetworkReset|FIFOReset|TxReset) << 16); - iowrite16 (txthreshold, ioaddr + TxStartThresh); /* No need to reset the Tx pointer here */ } /* Restart the Tx. */