: Fix deadlock in skge_tx_timeout
Subsystems (2)
[SKGE]: Fix deadlock in skge_tx_timeout
dev_watchdog() already holds the device lock, don't take it again in skge_tx_clean().
Signed-off-by Patrick McHardy <[email protected]>
---
commit 0b1cfafa6f6b8a168d5811d1f65cf540942c52b1
tree 4d3f252d6618adfe812e9da95cd496bb798e7c7b
parent 1ca949299260aa49eeba34ff912e2321c8b1f647
author Patrick McHardy <[email protected]> Sat, 24 Feb 2007 20:05:39 +0100 committer Patrick McHardy <[email protected]> Sat, 24 Feb 2007 20:05:39 +0100
drivers/net/skge.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/skge.c +2 -2
@@ -2575,7 +2575,9 @@ static int skge_down(struct net_device *skge_led (skge,LED_MODE_OFF );netif_poll_disable (dev); +netif_tx_lock_bh (dev);skge_tx_clean (dev); +netif_tx_unlock_bh (dev);skge_rx_clean (skge);kfree (skge->rx_ring.start);
@@ -2720,7 +2722,6 @@ static void skge_tx_clean(struct net_devstruct skge_port *skge =netdev_priv (dev);struct skge_element *e; -netif_tx_lock_bh (dev);for (e = skge->tx_ring.to_clean; e != skge->tx_ring.to_use; e = e->next) {struct skge_tx_desc *td = e->desc;skge_tx_free (skge, e, td->control);
@@ -2729,7 +2730,6 @@ static void skge_tx_clean(struct net_dev skge->tx_ring.to_clean = e;netif_wake_queue (dev); -netif_tx_unlock_bh (dev); }static void skge_tx_timeout (struct net_device *dev)
On Sat, 24 Feb 2007 20:08:23 +0100
Patrick McHardy <[email protected]> wrote:
This looks correct. Probably never hit it since the hardware for skge is more stable and doesn't timeout.
Signature · 1 line
Stephen Hemminger <[email protected]>