projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] libertas: Purge non-mesh ioctls
[powerpc.git]
/
drivers
/
net
/
ibmlana.c
diff --git
a/drivers/net/ibmlana.c
b/drivers/net/ibmlana.c
index
2a95d72
..
fe85d6f
100644
(file)
--- a/
drivers/net/ibmlana.c
+++ b/
drivers/net/ibmlana.c
@@
-601,7
+601,6
@@
static void irqrx_handler(struct net_device *dev)
/* set up skb fields */
/* set up skb fields */
- skb->dev = dev;
skb->protocol = eth_type_trans(skb, dev);
skb->ip_summed = CHECKSUM_NONE;
skb->protocol = eth_type_trans(skb, dev);
skb->ip_summed = CHECKSUM_NONE;
@@
-705,7
+704,7
@@
static void irqtxerr_handler(struct net_device *dev)
/* general interrupt entry */
/* general interrupt entry */
-static irqreturn_t irq_handler(int irq, void *device
, struct pt_regs *regs
)
+static irqreturn_t irq_handler(int irq, void *device)
{
struct net_device *dev = (struct net_device *) device;
u16 ival;
{
struct net_device *dev = (struct net_device *) device;
u16 ival;