Commit 836cf7fa authored by Anton Vorontsov's avatar Anton Vorontsov Committed by David S. Miller

gianfar: Fix race between gfar_error() and gfar_start_xmit()

gfar_error() can arrive at the middle of gfar_start_xmit() processing,
and so it can trigger transfers of BDs that we don't yet expect to
be transmitted.

Fix this by locking the tx queues in gfar_error().
Signed-off-by: default avatarAnton Vorontsov <avorontsov@ru.mvista.com>
Acked-by: default avatarKumar Gala <galak@kernel.crashing.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 499428ed
...@@ -2943,14 +2943,22 @@ static irqreturn_t gfar_error(int irq, void *grp_id) ...@@ -2943,14 +2943,22 @@ static irqreturn_t gfar_error(int irq, void *grp_id)
if (events & IEVENT_CRL) if (events & IEVENT_CRL)
dev->stats.tx_aborted_errors++; dev->stats.tx_aborted_errors++;
if (events & IEVENT_XFUN) { if (events & IEVENT_XFUN) {
unsigned long flags;
if (netif_msg_tx_err(priv)) if (netif_msg_tx_err(priv))
printk(KERN_DEBUG "%s: TX FIFO underrun, " printk(KERN_DEBUG "%s: TX FIFO underrun, "
"packet dropped.\n", dev->name); "packet dropped.\n", dev->name);
dev->stats.tx_dropped++; dev->stats.tx_dropped++;
priv->extra_stats.tx_underrun++; priv->extra_stats.tx_underrun++;
local_irq_save(flags);
lock_tx_qs(priv);
/* Reactivate the Tx Queues */ /* Reactivate the Tx Queues */
gfar_write(&regs->tstat, gfargrp->tstat); gfar_write(&regs->tstat, gfargrp->tstat);
unlock_tx_qs(priv);
local_irq_restore(flags);
} }
if (netif_msg_tx_err(priv)) if (netif_msg_tx_err(priv))
printk(KERN_DEBUG "%s: Transmit Error\n", dev->name); printk(KERN_DEBUG "%s: Transmit Error\n", dev->name);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment