git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
b43: LP-PHY: Two small spec updates
[pandora-kernel.git]
/
drivers
/
net
/
isa-skeleton.c
diff --git
a/drivers/net/isa-skeleton.c
b/drivers/net/isa-skeleton.c
index
73585fd
..
9706e64
100644
(file)
--- a/
drivers/net/isa-skeleton.c
+++ b/
drivers/net/isa-skeleton.c
@@
-430,7
+430,8
@@
static int net_send_packet(struct sk_buff *skb, struct net_device *dev)
* hardware interrupt handler. Queue flow control is
* thus managed under this lock as well.
*/
* hardware interrupt handler. Queue flow control is
* thus managed under this lock as well.
*/
- spin_lock_irq(&np->lock);
+ unsigned long flags;
+ spin_lock_irqsave(&np->lock, flags);
add_to_tx_ring(np, skb, length);
dev->trans_start = jiffies;
add_to_tx_ring(np, skb, length);
dev->trans_start = jiffies;
@@
-446,7
+447,7
@@
static int net_send_packet(struct sk_buff *skb, struct net_device *dev)
* is when the transmit statistics are updated.
*/
* is when the transmit statistics are updated.
*/
- spin_unlock_irq
(&np->lock
);
+ spin_unlock_irq
restore(&np->lock, flags
);
#else
/* This is the case for older hardware which takes
* a single transmit buffer at a time, and it is
#else
/* This is the case for older hardware which takes
* a single transmit buffer at a time, and it is
@@
-467,7
+468,7
@@
static int net_send_packet(struct sk_buff *skb, struct net_device *dev)
dev_kfree_skb (skb);
#endif
dev_kfree_skb (skb);
#endif
- return
0
;
+ return
NETDEV_TX_OK
;
}
#if TX_RING
}
#if TX_RING