diff options
| author | Scott Wood <scottwood@freescale.com> | 2013-04-05 22:43:55 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2013-04-05 22:43:55 (GMT) |
| commit | 392aeab578c624bb00787b21d7a0b27f31785f23 (patch) | |
| tree | 56d38ed817345321aa2d24add000d2f147298e92 /drivers/net/ethernet/tehuti | |
| parent | ca1eff3e439fa5597da8cdf3f5b83ce962a0d912 (diff) | |
| parent | 4d72f19861e95cf911e0336882f0958f39f5cad0 (diff) | |
| download | linux-fsl-qoriq-392aeab578c624bb00787b21d7a0b27f31785f23.tar.xz | |
Merge tag 'v3.8.4-rt2'
Diffstat (limited to 'drivers/net/ethernet/tehuti')
| -rw-r--r-- | drivers/net/ethernet/tehuti/tehuti.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/net/ethernet/tehuti/tehuti.c b/drivers/net/ethernet/tehuti/tehuti.c index e15cc71..f64e807 100644 --- a/drivers/net/ethernet/tehuti/tehuti.c +++ b/drivers/net/ethernet/tehuti/tehuti.c @@ -1630,13 +1630,8 @@ static netdev_tx_t bdx_tx_transmit(struct sk_buff *skb, unsigned long flags; ENTER; - local_irq_save(flags); - if (!spin_trylock(&priv->tx_lock)) { - local_irq_restore(flags); - DBG("%s[%s]: TX locked, returning NETDEV_TX_LOCKED\n", - BDX_DRV_NAME, ndev->name); - return NETDEV_TX_LOCKED; - } + + spin_lock_irqsave(&priv->tx_lock, flags); /* build tx descriptor */ BDX_ASSERT(f->m.wptr >= f->m.memsz); /* started with valid wptr */ |