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
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
drivers
/
net
/
macb.c
diff --git
a/drivers/net/macb.c
b/drivers/net/macb.c
index
5b5c253
..
01aaca9
100644
(file)
--- a/
drivers/net/macb.c
+++ b/
drivers/net/macb.c
@@
-620,6
+620,7
@@
static int macb_start_xmit(struct sk_buff *skb, struct net_device *dev)
dma_addr_t mapping;
unsigned int len, entry;
u32 ctrl;
dma_addr_t mapping;
unsigned int len, entry;
u32 ctrl;
+ unsigned long flags;
#ifdef DEBUG
int i;
#ifdef DEBUG
int i;
@@
-635,12
+636,12
@@
static int macb_start_xmit(struct sk_buff *skb, struct net_device *dev)
#endif
len = skb->len;
#endif
len = skb->len;
- spin_lock_irq
(&bp->lock
);
+ spin_lock_irq
save(&bp->lock, flags
);
/* This is a hard error, log it. */
if (TX_BUFFS_AVAIL(bp) < 1) {
netif_stop_queue(dev);
/* This is a hard error, log it. */
if (TX_BUFFS_AVAIL(bp) < 1) {
netif_stop_queue(dev);
- spin_unlock_irq
(&bp->lock
);
+ spin_unlock_irq
restore(&bp->lock, flags
);
dev_err(&bp->pdev->dev,
"BUG! Tx Ring full when queue awake!\n");
dev_dbg(&bp->pdev->dev, "tx_head = %u, tx_tail = %u\n",
dev_err(&bp->pdev->dev,
"BUG! Tx Ring full when queue awake!\n");
dev_dbg(&bp->pdev->dev, "tx_head = %u, tx_tail = %u\n",
@@
-674,11
+675,11
@@
static int macb_start_xmit(struct sk_buff *skb, struct net_device *dev)
if (TX_BUFFS_AVAIL(bp) < 1)
netif_stop_queue(dev);
if (TX_BUFFS_AVAIL(bp) < 1)
netif_stop_queue(dev);
- spin_unlock_irq
(&bp->lock
);
+ spin_unlock_irq
restore(&bp->lock, flags
);
dev->trans_start = jiffies;
dev->trans_start = jiffies;
- return
0
;
+ return
NETDEV_TX_OK
;
}
static void macb_free_consistent(struct macb *bp)
}
static void macb_free_consistent(struct macb *bp)