aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/de620.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/de620.c')
-rw-r--r--drivers/net/de620.c38
1 files changed, 19 insertions, 19 deletions
diff --git a/drivers/net/de620.c b/drivers/net/de620.c
index 22fc5b869a60..a18d4d14b665 100644
--- a/drivers/net/de620.c
+++ b/drivers/net/de620.c
@@ -40,7 +40,7 @@
40 *****************************************************************************/ 40 *****************************************************************************/
41static const char version[] = 41static const char version[] =
42 "de620.c: $Revision: 1.40 $, Bjorn Ekwall <bj0rn@blox.se>\n"; 42 "de620.c: $Revision: 1.40 $, Bjorn Ekwall <bj0rn@blox.se>\n";
43 43
44/*********************************************************************** 44/***********************************************************************
45 * 45 *
46 * "Tuning" section. 46 * "Tuning" section.
@@ -115,7 +115,7 @@ static const char version[] =
115#define COUNT_LOOPS 115#define COUNT_LOOPS
116 */ 116 */
117#endif 117#endif
118 118
119#include <linux/module.h> 119#include <linux/module.h>
120#include <linux/kernel.h> 120#include <linux/kernel.h>
121#include <linux/types.h> 121#include <linux/types.h>
@@ -250,7 +250,7 @@ static struct nic {
250 byte Media; 250 byte Media;
251 byte SCR; 251 byte SCR;
252} nic_data; 252} nic_data;
253 253
254/********************************************************** 254/**********************************************************
255 * * 255 * *
256 * Convenience macros/functions for D-Link DE-620 adapter * 256 * Convenience macros/functions for D-Link DE-620 adapter *
@@ -432,7 +432,7 @@ de620_get_register(struct net_device *dev, byte reg)
432 432
433 return value; 433 return value;
434} 434}
435 435
436/********************************************************************* 436/*********************************************************************
437 * 437 *
438 * Open/initialize the board. 438 * Open/initialize the board.
@@ -515,10 +515,10 @@ static void de620_set_multicast_list(struct net_device *dev)
515} 515}
516 516
517/******************************************************* 517/*******************************************************
518 * 518 *
519 * Handle timeouts on transmit 519 * Handle timeouts on transmit
520 */ 520 */
521 521
522static void de620_timeout(struct net_device *dev) 522static void de620_timeout(struct net_device *dev)
523{ 523{
524 printk(KERN_WARNING "%s: transmit timed out, %s?\n", dev->name, "network cable problem"); 524 printk(KERN_WARNING "%s: transmit timed out, %s?\n", dev->name, "network cable problem");
@@ -540,9 +540,9 @@ static int de620_start_xmit(struct sk_buff *skb, struct net_device *dev)
540 byte using_txbuf; 540 byte using_txbuf;
541 541
542 using_txbuf = de620_tx_buffs(dev); /* Peek at the adapter */ 542 using_txbuf = de620_tx_buffs(dev); /* Peek at the adapter */
543 543
544 netif_stop_queue(dev); 544 netif_stop_queue(dev);
545 545
546 546
547 if ((len = skb->len) < RUNT) 547 if ((len = skb->len) < RUNT)
548 len = RUNT; 548 len = RUNT;
@@ -584,7 +584,7 @@ static int de620_start_xmit(struct sk_buff *skb, struct net_device *dev)
584 dev_kfree_skb (skb); 584 dev_kfree_skb (skb);
585 return 0; 585 return 0;
586} 586}
587 587
588/***************************************************** 588/*****************************************************
589 * 589 *
590 * Handle the network interface interrupts. 590 * Handle the network interface interrupts.
@@ -599,7 +599,7 @@ de620_interrupt(int irq_in, void *dev_id, struct pt_regs *regs)
599 int again = 0; 599 int again = 0;
600 600
601 spin_lock(&de620_lock); 601 spin_lock(&de620_lock);
602 602
603 /* Read the status register (_not_ the status port) */ 603 /* Read the status register (_not_ the status port) */
604 irq_status = de620_get_register(dev, R_STS); 604 irq_status = de620_get_register(dev, R_STS);
605 605
@@ -615,7 +615,7 @@ de620_interrupt(int irq_in, void *dev_id, struct pt_regs *regs)
615 615
616 if(de620_tx_buffs(dev) != (TXBF0 | TXBF1)) 616 if(de620_tx_buffs(dev) != (TXBF0 | TXBF1))
617 netif_wake_queue(dev); 617 netif_wake_queue(dev);
618 618
619 spin_unlock(&de620_lock); 619 spin_unlock(&de620_lock);
620 return IRQ_HANDLED; 620 return IRQ_HANDLED;
621} 621}
@@ -720,7 +720,7 @@ static int de620_rx_intr(struct net_device *dev)
720 720
721 return (next_rx_page != curr_page); /* That was slightly tricky... */ 721 return (next_rx_page != curr_page); /* That was slightly tricky... */
722} 722}
723 723
724/********************************************* 724/*********************************************
725 * 725 *
726 * Reset the adapter to a known state 726 * Reset the adapter to a known state
@@ -803,7 +803,7 @@ static int adapter_init(struct net_device *dev)
803 803
804 return 0; /* all ok */ 804 return 0; /* all ok */
805} 805}
806 806
807/****************************************************************************** 807/******************************************************************************
808 * 808 *
809 * Only start-up code below 809 * Only start-up code below
@@ -827,7 +827,7 @@ struct net_device * __init de620_probe(int unit)
827 SET_MODULE_OWNER(dev); 827 SET_MODULE_OWNER(dev);
828 828
829 spin_lock_init(&de620_lock); 829 spin_lock_init(&de620_lock);
830 830
831 /* 831 /*
832 * This is where the base_addr and irq gets set. 832 * This is where the base_addr and irq gets set.
833 * Tunable at compile-time and insmod-time 833 * Tunable at compile-time and insmod-time
@@ -840,7 +840,7 @@ struct net_device * __init de620_probe(int unit)
840 sprintf(dev->name, "eth%d", unit); 840 sprintf(dev->name, "eth%d", unit);
841 netdev_boot_setup_check(dev); 841 netdev_boot_setup_check(dev);
842 } 842 }
843 843
844 if (de620_debug) 844 if (de620_debug)
845 printk(version); 845 printk(version);
846 846
@@ -889,7 +889,7 @@ struct net_device * __init de620_probe(int unit)
889 dev->tx_timeout = de620_timeout; 889 dev->tx_timeout = de620_timeout;
890 dev->watchdog_timeo = HZ*2; 890 dev->watchdog_timeo = HZ*2;
891 dev->set_multicast_list = de620_set_multicast_list; 891 dev->set_multicast_list = de620_set_multicast_list;
892 892
893 /* base_addr and irq are already set, see above! */ 893 /* base_addr and irq are already set, see above! */
894 894
895 /* dump eeprom */ 895 /* dump eeprom */
@@ -917,7 +917,7 @@ out1:
917out: 917out:
918 return ERR_PTR(err); 918 return ERR_PTR(err);
919} 919}
920 920
921/********************************** 921/**********************************
922 * 922 *
923 * Read info from on-board EEPROM 923 * Read info from on-board EEPROM
@@ -1003,7 +1003,7 @@ static int __init read_eeprom(struct net_device *dev)
1003 1003
1004 return 0; /* no errors */ 1004 return 0; /* no errors */
1005} 1005}
1006 1006
1007/****************************************************************************** 1007/******************************************************************************
1008 * 1008 *
1009 * Loadable module skeleton 1009 * Loadable module skeleton
@@ -1029,7 +1029,7 @@ void cleanup_module(void)
1029#endif /* MODULE */ 1029#endif /* MODULE */
1030MODULE_LICENSE("GPL"); 1030MODULE_LICENSE("GPL");
1031 1031
1032 1032
1033/* 1033/*
1034 * (add '-DMODULE' when compiling as loadable module) 1034 * (add '-DMODULE' when compiling as loadable module)
1035 * 1035 *