aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/tulip/tulip.h17
-rw-r--r--drivers/net/tulip/tulip_core.c7
2 files changed, 13 insertions, 11 deletions
diff --git a/drivers/net/tulip/tulip.h b/drivers/net/tulip/tulip.h
index 64d443a80d8..25668ddb1f7 100644
--- a/drivers/net/tulip/tulip.h
+++ b/drivers/net/tulip/tulip.h
@@ -30,11 +30,10 @@
30/* undefine, or define to various debugging levels (>4 == obscene levels) */ 30/* undefine, or define to various debugging levels (>4 == obscene levels) */
31#define TULIP_DEBUG 1 31#define TULIP_DEBUG 1
32 32
33/* undefine USE_IO_OPS for MMIO, define for PIO */
34#ifdef CONFIG_TULIP_MMIO 33#ifdef CONFIG_TULIP_MMIO
35# undef USE_IO_OPS 34#define TULIP_BAR 1 /* CBMA */
36#else 35#else
37# define USE_IO_OPS 1 36#define TULIP_BAR 0 /* CBIO */
38#endif 37#endif
39 38
40 39
@@ -143,6 +142,7 @@ enum status_bits {
143 RxNoBuf = 0x80, 142 RxNoBuf = 0x80,
144 RxIntr = 0x40, 143 RxIntr = 0x40,
145 TxFIFOUnderflow = 0x20, 144 TxFIFOUnderflow = 0x20,
145 RxErrIntr = 0x10,
146 TxJabber = 0x08, 146 TxJabber = 0x08,
147 TxNoBuf = 0x04, 147 TxNoBuf = 0x04,
148 TxDied = 0x02, 148 TxDied = 0x02,
@@ -193,9 +193,14 @@ struct tulip_tx_desc {
193 193
194 194
195enum desc_status_bits { 195enum desc_status_bits {
196 DescOwned = 0x80000000, 196 DescOwned = 0x80000000,
197 RxDescFatalErr = 0x8000, 197 DescWholePkt = 0x60000000,
198 RxWholePkt = 0x0300, 198 DescEndPkt = 0x40000000,
199 DescStartPkt = 0x20000000,
200 DescEndRing = 0x02000000,
201 DescUseLink = 0x01000000,
202 RxDescFatalErr = 0x008000,
203 RxWholePkt = 0x00000300,
199}; 204};
200 205
201 206
diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c
index 7e1ca3cae1e..def5999f987 100644
--- a/drivers/net/tulip/tulip_core.c
+++ b/drivers/net/tulip/tulip_core.c
@@ -1357,11 +1357,8 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
1357 if (pci_request_regions (pdev, "tulip")) 1357 if (pci_request_regions (pdev, "tulip"))
1358 goto err_out_free_netdev; 1358 goto err_out_free_netdev;
1359 1359
1360#ifndef USE_IO_OPS 1360 ioaddr = pci_iomap(pdev, TULIP_BAR, tulip_tbl[chip_idx].io_size);
1361 ioaddr = pci_iomap(pdev, 1, tulip_tbl[chip_idx].io_size); 1361
1362#else
1363 ioaddr = pci_iomap(pdev, 0, tulip_tbl[chip_idx].io_size);
1364#endif
1365 if (!ioaddr) 1362 if (!ioaddr)
1366 goto err_out_free_res; 1363 goto err_out_free_res;
1367 1364