git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
[safe/jmp/linux-2.6]
/
drivers
/
net
/
tulip
/
de2104x.c
diff --git
a/drivers/net/tulip/de2104x.c
b/drivers/net/tulip/de2104x.c
index
17a2eba
..
2cfd963
100644
(file)
--- a/
drivers/net/tulip/de2104x.c
+++ b/
drivers/net/tulip/de2104x.c
@@
-484,7
+484,7
@@
rx_next:
de->rx_tail = rx_tail;
}
de->rx_tail = rx_tail;
}
-static irqreturn_t de_interrupt (int irq, void *dev_instance
, struct pt_regs *regs
)
+static irqreturn_t de_interrupt (int irq, void *dev_instance)
{
struct net_device *dev = dev_instance;
struct de_private *de = dev->priv;
{
struct net_device *dev = dev_instance;
struct de_private *de = dev->priv;
@@
-1670,7
+1670,7
@@
static void de_get_regs(struct net_device *dev, struct ethtool_regs *regs,
spin_unlock_irq(&de->lock);
}
spin_unlock_irq(&de->lock);
}
-static struct ethtool_ops de_ethtool_ops = {
+static
const
struct ethtool_ops de_ethtool_ops = {
.get_link = ethtool_op_get_link,
.get_tx_csum = ethtool_op_get_tx_csum,
.get_sg = ethtool_op_get_sg,
.get_link = ethtool_op_get_link,
.get_tx_csum = ethtool_op_get_tx_csum,
.get_sg = ethtool_op_get_sg,