projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pasemi_mac: Fix register defines
[powerpc.git]
/
drivers
/
net
/
de620.c
diff --git
a/drivers/net/de620.c
b/drivers/net/de620.c
index
a18d4d1
..
dc48924
100644
(file)
--- a/
drivers/net/de620.c
+++ b/
drivers/net/de620.c
@@
-221,7
+221,7
@@
static void de620_set_multicast_list(struct net_device *);
static int de620_start_xmit(struct sk_buff *, struct net_device *);
/* Dispatch from interrupts. */
static int de620_start_xmit(struct sk_buff *, struct net_device *);
/* Dispatch from interrupts. */
-static irqreturn_t de620_interrupt(int, void *
, struct pt_regs *
);
+static irqreturn_t de620_interrupt(int, void *);
static int de620_rx_intr(struct net_device *);
/* Initialization */
static int de620_rx_intr(struct net_device *);
/* Initialization */
@@
-591,7
+591,7
@@
static int de620_start_xmit(struct sk_buff *skb, struct net_device *dev)
*
*/
static irqreturn_t
*
*/
static irqreturn_t
-de620_interrupt(int irq_in, void *dev_id
, struct pt_regs *regs
)
+de620_interrupt(int irq_in, void *dev_id)
{
struct net_device *dev = dev_id;
byte irq_status;
{
struct net_device *dev = dev_id;
byte irq_status;
@@
-697,7
+697,6
@@
static int de620_rx_intr(struct net_device *dev)
}
else { /* Yep! Go get it! */
skb_reserve(skb,2); /* Align */
}
else { /* Yep! Go get it! */
skb_reserve(skb,2); /* Align */
- skb->dev = dev;
/* skb->data points to the start of sk_buff data area */
buffer = skb_put(skb,size);
/* copy the packet into the buffer */
/* skb->data points to the start of sk_buff data area */
buffer = skb_put(skb,size);
/* copy the packet into the buffer */