diff options
| author | David S. Miller <davem@davemloft.net> | 2009-09-02 09:32:56 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-02 09:32:56 +0200 |
| commit | 6cdee2f96a97f6da26bd3759c3f8823332fbb438 (patch) | |
| tree | ec79086f05ffc3bdf1aecc37e108ccfc3a95450d /drivers/net/b44.c | |
| parent | ipv6: ip6_push_pending_frames() should increment IPSTATS_MIB_OUTDISCARDS (diff) | |
| parent | pkt_sched: Revert tasklet_hrtimer changes. (diff) | |
| download | linux-6cdee2f96a97f6da26bd3759c3f8823332fbb438.tar.xz linux-6cdee2f96a97f6da26bd3759c3f8823332fbb438.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/yellowfin.c
Diffstat (limited to 'drivers/net/b44.c')
| -rw-r--r-- | drivers/net/b44.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/b44.c b/drivers/net/b44.c index bee510177a3f..951735c9ec0b 100644 --- a/drivers/net/b44.c +++ b/drivers/net/b44.c @@ -952,9 +952,10 @@ static netdev_tx_t b44_start_xmit(struct sk_buff *skb, struct net_device *dev) int rc = NETDEV_TX_OK; dma_addr_t mapping; u32 len, entry, ctrl; + unsigned long flags; len = skb->len; - spin_lock_irq(&bp->lock); + spin_lock_irqsave(&bp->lock, flags); /* This is a hard error, log it. */ if (unlikely(TX_BUFFS_AVAIL(bp) < 1)) { @@ -1027,7 +1028,7 @@ static netdev_tx_t b44_start_xmit(struct sk_buff *skb, struct net_device *dev) dev->trans_start = jiffies; out_unlock: - spin_unlock_irq(&bp->lock); + spin_unlock_irqrestore(&bp->lock, flags); return rc; |