diff options
Diffstat (limited to 'drivers/net/wd.c')
-rw-r--r-- | drivers/net/wd.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wd.c b/drivers/net/wd.c index b1ba1872f315..41f1d6778849 100644 --- a/drivers/net/wd.c +++ b/drivers/net/wd.c | |||
@@ -61,7 +61,7 @@ static void wd_block_output(struct net_device *dev, int count, | |||
61 | const unsigned char *buf, int start_page); | 61 | const unsigned char *buf, int start_page); |
62 | static int wd_close(struct net_device *dev); | 62 | static int wd_close(struct net_device *dev); |
63 | 63 | ||
64 | 64 | ||
65 | #define WD_START_PG 0x00 /* First page of TX buffer */ | 65 | #define WD_START_PG 0x00 /* First page of TX buffer */ |
66 | #define WD03_STOP_PG 0x20 /* Last page +1 of RX ring */ | 66 | #define WD03_STOP_PG 0x20 /* Last page +1 of RX ring */ |
67 | #define WD13_STOP_PG 0x40 /* Last page +1 of RX ring */ | 67 | #define WD13_STOP_PG 0x40 /* Last page +1 of RX ring */ |
@@ -75,7 +75,7 @@ static int wd_close(struct net_device *dev); | |||
75 | #define WD_NIC_OFFSET 16 /* Offset to the 8390 from the base_addr. */ | 75 | #define WD_NIC_OFFSET 16 /* Offset to the 8390 from the base_addr. */ |
76 | #define WD_IO_EXTENT 32 | 76 | #define WD_IO_EXTENT 32 |
77 | 77 | ||
78 | 78 | ||
79 | /* Probe for the WD8003 and WD8013. These cards have the station | 79 | /* Probe for the WD8003 and WD8013. These cards have the station |
80 | address PROM at I/O ports <base>+8 to <base>+13, with a checksum | 80 | address PROM at I/O ports <base>+8 to <base>+13, with a checksum |
81 | following. A Soundblaster can have the same checksum as an WDethercard, | 81 | following. A Soundblaster can have the same checksum as an WDethercard, |
@@ -100,7 +100,7 @@ static int __init do_wd_probe(struct net_device *dev) | |||
100 | if ( r == NULL) | 100 | if ( r == NULL) |
101 | return -EBUSY; | 101 | return -EBUSY; |
102 | i = wd_probe1(dev, base_addr); | 102 | i = wd_probe1(dev, base_addr); |
103 | if (i != 0) | 103 | if (i != 0) |
104 | release_region(base_addr, WD_IO_EXTENT); | 104 | release_region(base_addr, WD_IO_EXTENT); |
105 | else | 105 | else |
106 | r->name = dev->name; | 106 | r->name = dev->name; |
@@ -272,7 +272,7 @@ static int __init wd_probe1(struct net_device *dev, int ioaddr) | |||
272 | a reliable way to trigger an interrupt. */ | 272 | a reliable way to trigger an interrupt. */ |
273 | outb_p(E8390_NODMA + E8390_STOP, nic_addr); | 273 | outb_p(E8390_NODMA + E8390_STOP, nic_addr); |
274 | outb(0x00, nic_addr+EN0_IMR); /* Disable all intrs. */ | 274 | outb(0x00, nic_addr+EN0_IMR); /* Disable all intrs. */ |
275 | 275 | ||
276 | irq_mask = probe_irq_on(); | 276 | irq_mask = probe_irq_on(); |
277 | outb_p(0xff, nic_addr + EN0_IMR); /* Enable all interrupts. */ | 277 | outb_p(0xff, nic_addr + EN0_IMR); /* Enable all interrupts. */ |
278 | outb_p(0x00, nic_addr + EN0_RCNTLO); | 278 | outb_p(0x00, nic_addr + EN0_RCNTLO); |
@@ -280,7 +280,7 @@ static int __init wd_probe1(struct net_device *dev, int ioaddr) | |||
280 | outb(E8390_RREAD+E8390_START, nic_addr); /* Trigger it... */ | 280 | outb(E8390_RREAD+E8390_START, nic_addr); /* Trigger it... */ |
281 | mdelay(20); | 281 | mdelay(20); |
282 | dev->irq = probe_irq_off(irq_mask); | 282 | dev->irq = probe_irq_off(irq_mask); |
283 | 283 | ||
284 | outb_p(0x00, nic_addr+EN0_IMR); /* Mask all intrs. again. */ | 284 | outb_p(0x00, nic_addr+EN0_IMR); /* Mask all intrs. again. */ |
285 | 285 | ||
286 | if (ei_debug > 2) | 286 | if (ei_debug > 2) |
@@ -478,7 +478,7 @@ wd_close(struct net_device *dev) | |||
478 | return 0; | 478 | return 0; |
479 | } | 479 | } |
480 | 480 | ||
481 | 481 | ||
482 | #ifdef MODULE | 482 | #ifdef MODULE |
483 | #define MAX_WD_CARDS 4 /* Max number of wd cards per module */ | 483 | #define MAX_WD_CARDS 4 /* Max number of wd cards per module */ |
484 | static struct net_device *dev_wd[MAX_WD_CARDS]; | 484 | static struct net_device *dev_wd[MAX_WD_CARDS]; |