git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[IRDA]: Fix rfcomm use-after-free
[pandora-kernel.git]
/
drivers
/
net
/
smc9194.c
diff --git
a/drivers/net/smc9194.c
b/drivers/net/smc9194.c
index
5506a0d
..
36c1eba
100644
(file)
--- a/
drivers/net/smc9194.c
+++ b/
drivers/net/smc9194.c
@@
-270,7
+270,7
@@
static void smc_set_multicast_list(struct net_device *dev);
/*
. Handles the actual interrupt
*/
/*
. Handles the actual interrupt
*/
-static irqreturn_t smc_interrupt(int irq, void *
, struct pt_regs *regs
);
+static irqreturn_t smc_interrupt(int irq, void *);
/*
. This is a separate procedure to handle the receipt of a packet, to
. leave the interrupt code looking slightly cleaner
/*
. This is a separate procedure to handle the receipt of a packet, to
. leave the interrupt code looking slightly cleaner
@@
-1262,7
+1262,6
@@
static void smc_rcv(struct net_device *dev)
skb_reserve( skb, 2 ); /* 16 bit alignment */
skb_reserve( skb, 2 ); /* 16 bit alignment */
- skb->dev = dev;
data = skb_put( skb, packet_length);
#ifdef USE_32_BIT
data = skb_put( skb, packet_length);
#ifdef USE_32_BIT
@@
-1391,7
+1390,7
@@
static void smc_tx( struct net_device * dev )
.
---------------------------------------------------------------------*/
.
---------------------------------------------------------------------*/
-static irqreturn_t smc_interrupt(int irq, void * dev_id
, struct pt_regs * regs
)
+static irqreturn_t smc_interrupt(int irq, void * dev_id)
{
struct net_device *dev = dev_id;
int ioaddr = dev->base_addr;
{
struct net_device *dev = dev_id;
int ioaddr = dev->base_addr;
@@
-1616,7
+1615,7
@@
int __init init_module(void)
return 0;
}
return 0;
}
-void cleanup_module(void)
+void
__exit
cleanup_module(void)
{
unregister_netdev(devSMC9194);
free_irq(devSMC9194->irq, devSMC9194);
{
unregister_netdev(devSMC9194);
free_irq(devSMC9194->irq, devSMC9194);