Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 208491d8 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by Jeff Garzik
Browse files

skge: race with workq and RTNL 



If a workqueue function that needs RTNL is running when skge_down
is called then a deadlock is possible. Fix by only clearing the timer,
and handling the flush_scheduled_work on removal. This work queue is only
ever used for the old fiber based boards.

Signed-off-by: default avatarStephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 8b5b4671

drivers/net/skge.c

+5 −4
Original line number Diff line number Diff line
@@ -1419,6 +1419,7 @@ static void xm_link_timer(struct work_struct *work) 
	mutex_unlock(&hw->phy_mutex);



nochange:

	if (netif_running(dev))

		schedule_delayed_work(&skge->link_thread, LINK_HZ);

}
@@ -2530,7 +2531,7 @@ static int skge_down(struct net_device *dev) 


	netif_stop_queue(dev);

	if (hw->chip_id == CHIP_ID_GENESIS && hw->phy_type == SK_PHY_XMAC)

		cancel_rearming_delayed_work(&skge->link_thread);

		cancel_delayed_work(&skge->link_thread);



	skge_write8(skge->hw, SK_REG(skge->port, LNK_LED_REG), LED_OFF);

	if (hw->chip_id == CHIP_ID_GENESIS)
@@ -3690,6 +3691,8 @@ static void __devexit skge_remove(struct pci_dev *pdev) 
	if (!hw)

		return;



	flush_scheduled_work();



	if ((dev1 = hw->dev[1]))

		unregister_netdev(dev1);

	dev0 = hw->dev[0];
@@ -3704,8 +3707,6 @@ static void __devexit skge_remove(struct pci_dev *pdev) 
	skge_write16(hw, B0_LED, LED_STAT_OFF);

	skge_write8(hw, B0_CTST, CS_RST_SET);



	flush_scheduled_work();



	free_irq(pdev->irq, hw);

	pci_release_regions(pdev);

	pci_disable_device(pdev);