git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
net
/
3c501.c
diff --git
a/drivers/net/3c501.c
b/drivers/net/3c501.c
index
0c99115
..
d7b115a
100644
(file)
--- a/
drivers/net/3c501.c
+++ b/
drivers/net/3c501.c
@@
-120,13
+120,12
@@
static const char version[] =
#include <linux/slab.h>
#include <linux/string.h>
#include <linux/errno.h>
#include <linux/slab.h>
#include <linux/string.h>
#include <linux/errno.h>
-#include <linux/config.h> /* for CONFIG_IP_MULTICAST */
#include <linux/spinlock.h>
#include <linux/ethtool.h>
#include <linux/delay.h>
#include <linux/spinlock.h>
#include <linux/ethtool.h>
#include <linux/delay.h>
+#include <linux/bitops.h>
#include <asm/uaccess.h>
#include <asm/uaccess.h>
-#include <asm/bitops.h>
#include <asm/io.h>
#include <linux/netdevice.h>
#include <asm/io.h>
#include <linux/netdevice.h>
@@
-508,11
+507,11
@@
static int el_start_xmit(struct sk_buff *skb, struct net_device *dev)
* speak of. We simply pull the packet out of its PIO buffer (which is slow)
* and queue it for the kernel. Then we reset the card for the next packet.
*
* speak of. We simply pull the packet out of its PIO buffer (which is slow)
* and queue it for the kernel. Then we reset the card for the next packet.
*
- * We sometimes get suprise interrupts late both because the SMP IRQ delivery
+ * We sometimes get su
r
prise interrupts late both because the SMP IRQ delivery
* is message passing and because the card sometimes seems to deliver late. I
* think if it is part way through a receive and the mode is changed it carries
* on receiving and sends us an interrupt. We have to band aid all these cases
* is message passing and because the card sometimes seems to deliver late. I
* think if it is part way through a receive and the mode is changed it carries
* on receiving and sends us an interrupt. We have to band aid all these cases
- * to get a sensible 150k
b
ytes/second performance. Even then you want a small
+ * to get a sensible 150k
B
ytes/second performance. Even then you want a small
* TCP window.
*/
* TCP window.
*/
@@
-892,8
+891,8
@@
static struct ethtool_ops netdev_ethtool_ops = {
static struct net_device *dev_3c501;
static struct net_device *dev_3c501;
-
MODULE_PARM(io, "i"
);
-
MODULE_PARM(irq, "i"
);
+
module_param(io, int, 0
);
+
module_param(irq, int, 0
);
MODULE_PARM_DESC(io, "EtherLink I/O base address");
MODULE_PARM_DESC(irq, "EtherLink IRQ number");
MODULE_PARM_DESC(io, "EtherLink I/O base address");
MODULE_PARM_DESC(irq, "EtherLink IRQ number");
@@
-909,7
+908,7
@@
MODULE_PARM_DESC(irq, "EtherLink IRQ number");
* here also causes the module to be unloaded
*/
* here also causes the module to be unloaded
*/
-int init_module(void)
+int
__init
init_module(void)
{
dev_3c501 = el1_probe(-1);
if (IS_ERR(dev_3c501))
{
dev_3c501 = el1_probe(-1);
if (IS_ERR(dev_3c501))