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
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
net
/
hamradio
/
dmascc.c
diff --git
a/drivers/net/hamradio/dmascc.c
b/drivers/net/hamradio/dmascc.c
index
f515245
..
0d5fccc
100644
(file)
--- a/
drivers/net/hamradio/dmascc.c
+++ b/
drivers/net/hamradio/dmascc.c
@@
-280,7
+280,7
@@
static unsigned long rand;
MODULE_AUTHOR("Klaus Kudielka");
MODULE_DESCRIPTION("Driver for high-speed SCC boards");
MODULE_AUTHOR("Klaus Kudielka");
MODULE_DESCRIPTION("Driver for high-speed SCC boards");
-
MODULE_PARM(io, "1-" __MODULE_STRING(MAX_NUM_DEVS) "i"
);
+
module_param_array(io, int, NULL, 0
);
MODULE_LICENSE("GPL");
static void __exit dmascc_exit(void)
MODULE_LICENSE("GPL");
static void __exit dmascc_exit(void)
@@
-311,16
+311,6
@@
static void __exit dmascc_exit(void)
}
}
}
}
-#ifndef MODULE
-void __init dmascc_setup(char *str, int *ints)
-{
- int i;
-
- for (i = 0; i < MAX_NUM_DEVS && i < ints[0]; i++)
- io[i] = ints[i + 1];
-}
-#endif
-
static int __init dmascc_init(void)
{
int h, i, j, n;
static int __init dmascc_init(void)
{
int h, i, j, n;
@@
-449,12
+439,12
@@
module_exit(dmascc_exit);
static void dev_setup(struct net_device *dev)
{
dev->type = ARPHRD_AX25;
static void dev_setup(struct net_device *dev)
{
dev->type = ARPHRD_AX25;
- dev->hard_header_len =
73
;
+ dev->hard_header_len =
AX25_MAX_HEADER_LEN
;
dev->mtu = 1500;
dev->mtu = 1500;
- dev->addr_len =
7
;
+ dev->addr_len =
AX25_ADDR_LEN
;
dev->tx_queue_len = 64;
dev->tx_queue_len = 64;
- memcpy(dev->broadcast, ax25_broadcast,
7
);
- memcpy(dev->dev_addr, ax25_test,
7
);
+ memcpy(dev->broadcast, ax25_broadcast,
AX25_ADDR_LEN
);
+ memcpy(dev->dev_addr, ax25_test,
AX25_ADDR_LEN
);
}
static int __init setup_adapter(int card_base, int type, int n)
}
static int __init setup_adapter(int card_base, int type, int n)
@@
-592,7
+582,6
@@
static int __init setup_adapter(int card_base, int type, int n)
INIT_WORK(&priv->rx_work, rx_bh, priv);
dev->priv = priv;
sprintf(dev->name, "dmascc%i", 2 * n + i);
INIT_WORK(&priv->rx_work, rx_bh, priv);
dev->priv = priv;
sprintf(dev->name, "dmascc%i", 2 * n + i);
- SET_MODULE_OWNER(dev);
dev->base_addr = card_base;
dev->irq = irq;
dev->open = scc_open;
dev->base_addr = card_base;
dev->irq = irq;
dev->open = scc_open;
@@
-600,7
+589,7
@@
static int __init setup_adapter(int card_base, int type, int n)
dev->do_ioctl = scc_ioctl;
dev->hard_start_xmit = scc_send_packet;
dev->get_stats = scc_get_stats;
dev->do_ioctl = scc_ioctl;
dev->hard_start_xmit = scc_send_packet;
dev->get_stats = scc_get_stats;
- dev->hard_header = ax25_
encapsulate
;
+ dev->hard_header = ax25_
hard_header
;
dev->rebuild_header = ax25_rebuild_header;
dev->set_mac_address = scc_set_mac_address;
}
dev->rebuild_header = ax25_rebuild_header;
dev->set_mac_address = scc_set_mac_address;
}