The patch titled
tulip: clean up tulip.h
has been added to the -mm tree. Its filename is
tulip-clean-up-tuliph.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: tulip: clean up tulip.h
From: Grant Grundler <grundler@xxxxxxxxxxxxxxxx>
Update/cleanup some definitions in tulip.h and tulip_core.c.
Signed-off-by: Grant Grundler <grundler@xxxxxxxxxxxxxxxx>
Signed-off-by: Kyle McMartin <kyle@xxxxxxxxxxxxxxxx>
Signed-off-by: Valerie Henson <val_henson@xxxxxxxxxxxxxxx>
Signed-off-by: Jeff Garzik <jeff@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/net/tulip/tulip.h | 17 +++++++++++------
drivers/net/tulip/tulip_core.c | 7 ++-----
2 files changed, 13 insertions(+), 11 deletions(-)
diff -puN drivers/net/tulip/tulip.h~tulip-clean-up-tuliph drivers/net/tulip/tulip.h
--- a/drivers/net/tulip/tulip.h~tulip-clean-up-tuliph
+++ a/drivers/net/tulip/tulip.h
@@ -30,11 +30,10 @@
/* undefine, or define to various debugging levels (>4 == obscene levels) */
#define TULIP_DEBUG 1
-/* undefine USE_IO_OPS for MMIO, define for PIO */
#ifdef CONFIG_TULIP_MMIO
-# undef USE_IO_OPS
+#define TULIP_BAR 1 /* CBMA */
#else
-# define USE_IO_OPS 1
+#define TULIP_BAR 0 /* CBIO */
#endif
@@ -143,6 +142,7 @@ enum status_bits {
RxNoBuf = 0x80,
RxIntr = 0x40,
TxFIFOUnderflow = 0x20,
+ RxErrIntr = 0x10,
TxJabber = 0x08,
TxNoBuf = 0x04,
TxDied = 0x02,
@@ -193,9 +193,14 @@ struct tulip_tx_desc {
enum desc_status_bits {
- DescOwned = 0x80000000,
- RxDescFatalErr = 0x8000,
- RxWholePkt = 0x0300,
+ DescOwned = 0x80000000,
+ DescWholePkt = 0x60000000,
+ DescEndPkt = 0x40000000,
+ DescStartPkt = 0x20000000,
+ DescEndRing = 0x02000000,
+ DescUseLink = 0x01000000,
+ RxDescFatalErr = 0x008000,
+ RxWholePkt = 0x00000300,
};
diff -puN drivers/net/tulip/tulip_core.c~tulip-clean-up-tuliph drivers/net/tulip/tulip_core.c
--- a/drivers/net/tulip/tulip_core.c~tulip-clean-up-tuliph
+++ a/drivers/net/tulip/tulip_core.c
@@ -1357,11 +1357,8 @@ static int __devinit tulip_init_one (str
if (pci_request_regions (pdev, "tulip"))
goto err_out_free_netdev;
-#ifndef USE_IO_OPS
- ioaddr = pci_iomap(pdev, 1, tulip_tbl[chip_idx].io_size);
-#else
- ioaddr = pci_iomap(pdev, 0, tulip_tbl[chip_idx].io_size);
-#endif
+ ioaddr = pci_iomap(pdev, TULIP_BAR, tulip_tbl[chip_idx].io_size);
+
if (!ioaddr)
goto err_out_free_res;
_
Patches currently in -mm which might be from grundler@xxxxxxxxxxxxxxxx are
tulip-print-physical-address-in-tulip_init_one.patch
tulip-flush-mmio-writes-in-reset-sequence.patch
tulip-clean-up-tuliph.patch
tulip-use-tuliph-in-winbond-840c.patch
tulip-fix-shutdown-dma-irq-race.patch
tulip-fix-for-64-bit-mips.patch
tulip-natsemi-dp83840a-phy-fix.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
