The patch titled
sundance: remove TxStartThresh and RxEarlyThresh
has been added to the -mm tree. Its filename is
sundance-remove-txstartthresh-and-rxearlythresh.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: sundance: remove TxStartThresh and RxEarlyThresh
From: Jesse Huang <jesse@xxxxxxxxxxxxx>
For pattern issue need to remove TxStartThresh and RxEarlyThresh.
Signed-off-by: Jesse Huang <jesse@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/net/sundance.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff -puN drivers/net/sundance.c~sundance-remove-txstartthresh-and-rxearlythresh drivers/net/sundance.c
--- a/drivers/net/sundance.c~sundance-remove-txstartthresh-and-rxearlythresh
+++ a/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,
int tx_cnt;
int tx_status;
int handled = 0;
+ int i;
do {
@@ -1153,17 +1152,14 @@ static irqreturn_t intr_handler(int irq,
np->stats.tx_fifo_errors++;
if (tx_status & 0x02)
np->stats.tx_window_errors++;
+
/*
** This reset has been verified on
** DFE-580TX boards ! phdm@xxxxxxxxxx
*/
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. */
_
Patches currently in -mm which might be from jesse@xxxxxxxxxxxxx are
sundance-remove-txstartthresh-and-rxearlythresh.patch
sundance-fix-tx-pause-bug-reset_tx-intr_handler.patch
sundance-change-phy-address-search-from-phy=1-to-phy=0.patch
sundance-correct-initial-and-close-hardware-step.patch
sundance-solve-host-error-problem-in-low-performance-embedded.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
