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 core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
net
/
hamradio
/
yam.c
diff --git
a/drivers/net/hamradio/yam.c
b/drivers/net/hamradio/yam.c
index
fe22479
..
6d74f08
100644
(file)
--- a/
drivers/net/hamradio/yam.c
+++ b/
drivers/net/hamradio/yam.c
@@
-42,7
+42,6
@@
/*****************************************************************************/
/*****************************************************************************/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/net.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/net.h>
@@
-157,11
+156,6
@@
static struct net_device *yam_devs[NR_PORTS];
static struct yam_mcs *yam_data;
static struct yam_mcs *yam_data;
-static char ax25_bcast[7] =
-{'Q' << 1, 'S' << 1, 'T' << 1, ' ' << 1, ' ' << 1, ' ' << 1, '0' << 1};
-static char ax25_test[7] =
-{'L' << 1, 'I' << 1, 'N' << 1, 'U' << 1, 'X' << 1, ' ' << 1, '1' << 1};
-
static DEFINE_TIMER(yam_timer, NULL, 0, 0);
/* --------------------------------------------------------------------- */
static DEFINE_TIMER(yam_timer, NULL, 0, 0);
/* --------------------------------------------------------------------- */
@@
-703,7
+697,7
@@
static void yam_tx_byte(struct net_device *dev, struct yam_port *yp)
* ISR routine
************************************************************************************/
* ISR routine
************************************************************************************/
-static irqreturn_t yam_interrupt(int irq, void *dev_id
, struct pt_regs *regs
)
+static irqreturn_t yam_interrupt(int irq, void *dev_id)
{
struct net_device *dev;
struct yam_port *yp;
{
struct net_device *dev;
struct yam_port *yp;
@@
-874,7
+868,7
@@
static int yam_open(struct net_device *dev)
goto out_release_base;
}
outb(0, IER(dev->base_addr));
goto out_release_base;
}
outb(0, IER(dev->base_addr));
- if (request_irq(dev->irq, yam_interrupt,
SA_INTERRUPT | SA_SHIRQ
, dev->name, dev)) {
+ if (request_irq(dev->irq, yam_interrupt,
IRQF_DISABLED | IRQF_SHARED
, dev->name, dev)) {
printk(KERN_ERR "%s: irq %d busy\n", dev->name, dev->irq);
ret = -EBUSY;
goto out_release_base;
printk(KERN_ERR "%s: irq %d busy\n", dev->name, dev->irq);
ret = -EBUSY;
goto out_release_base;
@@
-1098,7
+1092,6
@@
static void yam_setup(struct net_device *dev)
dev->base_addr = yp->iobase;
dev->irq = yp->irq;
dev->base_addr = yp->iobase;
dev->irq = yp->irq;
- SET_MODULE_OWNER(dev);
dev->open = yam_open;
dev->stop = yam_close;
dev->open = yam_open;
dev->stop = yam_close;
@@
-1117,8
+1110,8
@@
static void yam_setup(struct net_device *dev)
dev->hard_header_len = AX25_MAX_HEADER_LEN;
dev->mtu = AX25_MTU;
dev->addr_len = AX25_ADDR_LEN;
dev->hard_header_len = AX25_MAX_HEADER_LEN;
dev->mtu = AX25_MTU;
dev->addr_len = AX25_ADDR_LEN;
- memcpy(dev->broadcast, ax25_bcast, AX25_ADDR_LEN);
- memcpy(dev->dev_addr,
ax25_test
, AX25_ADDR_LEN);
+ memcpy(dev->broadcast,
&
ax25_bcast, AX25_ADDR_LEN);
+ memcpy(dev->dev_addr,
&ax25_defaddr
, AX25_ADDR_LEN);
}
static int __init yam_init_driver(void)
}
static int __init yam_init_driver(void)