diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-06-20 09:36:54 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-04-10 00:18:55 (GMT) |
| commit | 5001984143b8eab3715681063220aa6f57d9ebb0 (patch) | |
| tree | 2ed9c7ef93b2fc096a4781b34315e16c9731890d /drivers/net/ethernet/chelsio | |
| parent | e560bacfa970cf282e62596bebaaf4d50a76714c (diff) | |
| download | linux-fsl-qoriq-5001984143b8eab3715681063220aa6f57d9ebb0.tar.xz | |
drivers/net: fix livelock issues
Preempt-RT runs into a live lock issue with the NETDEV_TX_LOCKED micro
optimization. The reason is that the softirq thread is rescheduling
itself on that return value. Depending on priorities it starts to
monoplize the CPU and livelock on UP systems.
Remove it.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/net/ethernet/chelsio')
| -rw-r--r-- | drivers/net/ethernet/chelsio/cxgb/sge.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ethernet/chelsio/cxgb/sge.c b/drivers/net/ethernet/chelsio/cxgb/sge.c index 8061fb0..bfe5c72 100644 --- a/drivers/net/ethernet/chelsio/cxgb/sge.c +++ b/drivers/net/ethernet/chelsio/cxgb/sge.c @@ -1665,8 +1665,7 @@ static int t1_sge_tx(struct sk_buff *skb, struct adapter *adapter, struct cmdQ *q = &sge->cmdQ[qid]; unsigned int credits, pidx, genbit, count, use_sched_skb = 0; - if (!spin_trylock(&q->lock)) - return NETDEV_TX_LOCKED; + spin_lock(&q->lock); reclaim_completed_tx(sge, q); |