From: Jesse Brandeburg <jesse.brandeburg@intel.com>
Date: Tue, 8 Jul 2008 22:51:47 +0000 (-0700)
Subject: ixgb: fix unload race with timers
X-Git-Tag: v2.6.27-rc1~969^2~146^2~33
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=1257969724e7d5f878ac05067388ac5c012eb29b;p=linux-2.6-omap-h63xx.git

ixgb: fix unload race with timers

ixgb needs to call flush scheduled work to flush any timers before
unregistering the netdev.

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
---

diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c
index c3234c45104..79082eb577c 100644
--- a/drivers/net/ixgb/ixgb_main.c
+++ b/drivers/net/ixgb/ixgb_main.c
@@ -528,6 +528,8 @@ ixgb_remove(struct pci_dev *pdev)
 	struct net_device *netdev = pci_get_drvdata(pdev);
 	struct ixgb_adapter *adapter = netdev_priv(netdev);
 
+	flush_scheduled_work();
+
 	unregister_netdev(netdev);
 
 	iounmap(adapter->hw.hw_addr);