projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] ibmveth: Fix index increment calculation
[powerpc.git]
/
drivers
/
net
/
8390.c
diff --git
a/drivers/net/8390.c
b/drivers/net/8390.c
index
5b6b05e
..
3d1c599
100644
(file)
--- a/
drivers/net/8390.c
+++ b/
drivers/net/8390.c
@@
-299,7
+299,7
@@
static int ei_start_xmit(struct sk_buff *skb, struct net_device *dev)
* Slow phase with lock held.
*/
* Slow phase with lock held.
*/
- disable_irq_nosync_lockdep
(dev->irq
);
+ disable_irq_nosync_lockdep
_irqsave(dev->irq, &flags
);
spin_lock(&ei_local->page_lock);
spin_lock(&ei_local->page_lock);
@@
-338,7
+338,7
@@
static int ei_start_xmit(struct sk_buff *skb, struct net_device *dev)
netif_stop_queue(dev);
outb_p(ENISR_ALL, e8390_base + EN0_IMR);
spin_unlock(&ei_local->page_lock);
netif_stop_queue(dev);
outb_p(ENISR_ALL, e8390_base + EN0_IMR);
spin_unlock(&ei_local->page_lock);
- enable_irq_lockdep
(dev->irq
);
+ enable_irq_lockdep
_irqrestore(dev->irq, &flags
);
ei_local->stat.tx_errors++;
return 1;
}
ei_local->stat.tx_errors++;
return 1;
}
@@
-379,7
+379,7
@@
static int ei_start_xmit(struct sk_buff *skb, struct net_device *dev)
outb_p(ENISR_ALL, e8390_base + EN0_IMR);
spin_unlock(&ei_local->page_lock);
outb_p(ENISR_ALL, e8390_base + EN0_IMR);
spin_unlock(&ei_local->page_lock);
- enable_irq_lockdep
(dev->irq
);
+ enable_irq_lockdep
_irqrestore(dev->irq, &flags
);
dev_kfree_skb (skb);
ei_local->stat.tx_bytes += send_length;
dev_kfree_skb (skb);
ei_local->stat.tx_bytes += send_length;
@@
-391,7
+391,6
@@
static int ei_start_xmit(struct sk_buff *skb, struct net_device *dev)
* ei_interrupt - handle the interrupts from an 8390
* @irq: interrupt number
* @dev_id: a pointer to the net_device
* ei_interrupt - handle the interrupts from an 8390
* @irq: interrupt number
* @dev_id: a pointer to the net_device
- * @regs: unused
*
* Handle the ether interface interrupts. We pull packets from
* the 8390 via the card specific functions and fire them at the networking
*
* Handle the ether interface interrupts. We pull packets from
* the 8390 via the card specific functions and fire them at the networking
@@
-400,21
+399,15
@@
static int ei_start_xmit(struct sk_buff *skb, struct net_device *dev)
* needed.
*/
* needed.
*/
-irqreturn_t ei_interrupt(int irq, void *dev_id
, struct pt_regs * regs
)
+irqreturn_t ei_interrupt(int irq, void *dev_id)
{
struct net_device *dev = dev_id;
long e8390_base;
int interrupts, nr_serviced = 0;
struct ei_device *ei_local;
{
struct net_device *dev = dev_id;
long e8390_base;
int interrupts, nr_serviced = 0;
struct ei_device *ei_local;
- if (dev == NULL)
- {
- printk ("net_interrupt(): irq %d for unknown device.\n", irq);
- return IRQ_NONE;
- }
-
e8390_base = dev->base_addr;
e8390_base = dev->base_addr;
- ei_local =
(struct ei_device *)
netdev_priv(dev);
+ ei_local = netdev_priv(dev);
/*
* Protect the irq test too.
/*
* Protect the irq test too.
@@
-506,7
+499,7
@@
irqreturn_t ei_interrupt(int irq, void *dev_id, struct pt_regs * regs)
void ei_poll(struct net_device *dev)
{
disable_irq_lockdep(dev->irq);
void ei_poll(struct net_device *dev)
{
disable_irq_lockdep(dev->irq);
- ei_interrupt(dev->irq, dev
, NULL
);
+ ei_interrupt(dev->irq, dev);
enable_irq_lockdep(dev->irq);
}
#endif
enable_irq_lockdep(dev->irq);
}
#endif