UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

skge: deadlock on tx timeout 

The skge driver will deadlock if gets a transmit timeout
because the netif_tx_lock() is already held.

Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Stephen Hemminger 2007-03-16 14:01:26 -07:00 committed by Jeff Garzik
parent 12998096cc
commit e3a1b99fb6
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/skge.c
View File

@ -2576,7 +2576,11 @@ static int skge_down(struct net_device *dev)
skge_led(skge, LED_MODE_OFF); skge_led(skge, LED_MODE_OFF);
netif_poll_disable(dev); netif_poll_disable(dev);
netif_tx_lock_bh(dev);
skge_tx_clean(dev); skge_tx_clean(dev);
netif_tx_unlock_bh(dev);
skge_rx_clean(skge); skge_rx_clean(skge);
kfree(skge->rx_ring.start); kfree(skge->rx_ring.start);
@ -2721,7 +2725,6 @@ static void skge_tx_clean(struct net_device *dev)
struct skge_port *skge = netdev_priv(dev); struct skge_port *skge = netdev_priv(dev);
struct skge_element *e; 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) { for (e = skge->tx_ring.to_clean; e != skge->tx_ring.to_use; e = e->next) {
struct skge_tx_desc *td = e->desc; struct skge_tx_desc *td = e->desc;
skge_tx_free(skge, e, td->control); skge_tx_free(skge, e, td->control);
@ -2730,7 +2733,6 @@ static void skge_tx_clean(struct net_device *dev)
skge->tx_ring.to_clean = e; skge->tx_ring.to_clean = e;
netif_wake_queue(dev); netif_wake_queue(dev);
netif_tx_unlock_bh(dev);
} }
static void skge_tx_timeout(struct net_device *dev) static void skge_tx_timeout(struct net_device *dev)