aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/isa-skeleton.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/isa-skeleton.c')
-rw-r--r--drivers/net/isa-skeleton.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/isa-skeleton.c b/drivers/net/isa-skeleton.c
index 88ae8a04fabc..984c31d1b3fb 100644
--- a/drivers/net/isa-skeleton.c
+++ b/drivers/net/isa-skeleton.c
@@ -149,7 +149,7 @@ static int __init do_netcard_probe(struct net_device *dev)
149 149
150 return -ENODEV; 150 return -ENODEV;
151} 151}
152 152
153static void cleanup_card(struct net_device *dev) 153static void cleanup_card(struct net_device *dev)
154{ 154{
155#ifdef jumpered_dma 155#ifdef jumpered_dma
@@ -200,10 +200,10 @@ static int __init netcard_probe1(struct net_device *dev, int ioaddr)
200 return -EBUSY; 200 return -EBUSY;
201 201
202 /* 202 /*
203 * For ethernet adaptors the first three octets of the station address 203 * For ethernet adaptors the first three octets of the station address
204 * contains the manufacturer's unique code. That might be a good probe 204 * contains the manufacturer's unique code. That might be a good probe
205 * method. Ideally you would add additional checks. 205 * method. Ideally you would add additional checks.
206 */ 206 */
207 if (inb(ioaddr + 0) != SA_ADDR0 207 if (inb(ioaddr + 0) != SA_ADDR0
208 || inb(ioaddr + 1) != SA_ADDR1 208 || inb(ioaddr + 1) != SA_ADDR1
209 || inb(ioaddr + 2) != SA_ADDR2) 209 || inb(ioaddr + 2) != SA_ADDR2)
@@ -292,7 +292,7 @@ static int __init netcard_probe1(struct net_device *dev, int ioaddr)
292 if (i <= 0) { 292 if (i <= 0) {
293 printk("DMA probe failed.\n"); 293 printk("DMA probe failed.\n");
294 goto out1; 294 goto out1;
295 } 295 }
296 if (request_dma(dev->dma, cardname)) { 296 if (request_dma(dev->dma, cardname)) {
297 printk("probed DMA %d allocation failed.\n", dev->dma); 297 printk("probed DMA %d allocation failed.\n", dev->dma);
298 goto out1; 298 goto out1;
@@ -310,7 +310,7 @@ static int __init netcard_probe1(struct net_device *dev, int ioaddr)
310 dev->set_multicast_list = &set_multicast_list; 310 dev->set_multicast_list = &set_multicast_list;
311 311
312 dev->tx_timeout = &net_tx_timeout; 312 dev->tx_timeout = &net_tx_timeout;
313 dev->watchdog_timeo = MY_TX_TIMEOUT; 313 dev->watchdog_timeo = MY_TX_TIMEOUT;
314 314
315 err = register_netdev(dev); 315 err = register_netdev(dev);
316 if (err) 316 if (err)
@@ -551,7 +551,7 @@ net_rx(struct net_device *dev)
551 do { 551 do {
552 int status = inw(ioaddr); 552 int status = inw(ioaddr);
553 int pkt_len = inw(ioaddr); 553 int pkt_len = inw(ioaddr);
554 554
555 if (pkt_len == 0) /* Read all the frames? */ 555 if (pkt_len == 0) /* Read all the frames? */
556 break; /* Done for now */ 556 break; /* Done for now */
557 557
@@ -566,7 +566,7 @@ net_rx(struct net_device *dev)
566 struct sk_buff *skb; 566 struct sk_buff *skb;
567 567
568 lp->stats.rx_bytes+=pkt_len; 568 lp->stats.rx_bytes+=pkt_len;
569 569
570 skb = dev_alloc_skb(pkt_len); 570 skb = dev_alloc_skb(pkt_len);
571 if (skb == NULL) { 571 if (skb == NULL) {
572 printk(KERN_NOTICE "%s: Memory squeeze, dropping packet.\n", 572 printk(KERN_NOTICE "%s: Memory squeeze, dropping packet.\n",
@@ -663,7 +663,7 @@ set_multicast_list(struct net_device *dev)
663 663
664 outw(MULTICAST, ioaddr); 664 outw(MULTICAST, ioaddr);
665 } 665 }
666 else 666 else
667 outw(0, ioaddr); 667 outw(0, ioaddr);
668} 668}
669 669