projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pasemi_mac: Move the IRQ mapping from the PCI layer to the driver
[powerpc.git]
/
drivers
/
net
/
acenic.c
diff --git
a/drivers/net/acenic.c
b/drivers/net/acenic.c
index
71a4f60
..
7122b7b
100644
(file)
--- a/
drivers/net/acenic.c
+++ b/
drivers/net/acenic.c
@@
-2027,7
+2027,6
@@
static void ace_rx_int(struct net_device *dev, u32 rxretprd, u32 rxretcsm)
*/
csum = retdesc->tcp_udp_csum;
*/
csum = retdesc->tcp_udp_csum;
- skb->dev = dev;
skb->protocol = eth_type_trans(skb, dev);
/*
skb->protocol = eth_type_trans(skb, dev);
/*
@@
-2144,7
+2143,7
@@
static inline void ace_tx_int(struct net_device *dev,
}
}
-static irqreturn_t ace_interrupt(int irq, void *dev_id
, struct pt_regs *ptregs
)
+static irqreturn_t ace_interrupt(int irq, void *dev_id)
{
struct net_device *dev = (struct net_device *)dev_id;
struct ace_private *ap = netdev_priv(dev);
{
struct net_device *dev = (struct net_device *)dev_id;
struct ace_private *ap = netdev_priv(dev);
@@
-2293,10
+2292,7
@@
static void ace_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid)
local_irq_save(flags);
ace_mask_irq(dev);
local_irq_save(flags);
ace_mask_irq(dev);
-
- if (ap->vlgrp)
- ap->vlgrp->vlan_devices[vid] = NULL;
-
+ vlan_group_set_device(ap->vlgrp, vid, NULL);
ace_unmask_irq(dev);
local_irq_restore(flags);
}
ace_unmask_irq(dev);
local_irq_restore(flags);
}