---

yaml --- r: 22159 b: refs/heads/master c: 1d60290 h: refs/heads/master i: 22157: 4ecc60b 22155: 70bb018 22151: 3fe0563 22143: 6f309b1 v: v3
git-mirror · Mar 21, 2006 · 8db344f · 8db344f
1 parent 0606a46
commit 8db344f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3fdfcc2c95ffc7ee04b480a4c1fd4809b5ff2f7c
+refs/heads/master: 1d60290f27e7dc4bce2c43922d0bfa9abd246fc9
diff --git a/trunk/drivers/net/bnx2.c b/trunk/drivers/net/bnx2.c
@@ -14,8 +14,8 @@
 
 #define DRV_MODULE_NAME		"bnx2"
 #define PFX DRV_MODULE_NAME	": "
-#define DRV_MODULE_VERSION	"1.4.31"
-#define DRV_MODULE_RELDATE	"January 19, 2006"
+#define DRV_MODULE_VERSION	"1.4.37"
+#define DRV_MODULE_RELDATE	"February 1, 2006"
 
 #define RUN_AT(x) (jiffies + (x))
 
@@ -5765,6 +5765,7 @@ bnx2_suspend(struct pci_dev *pdev, pm_message_t state)
 	if (!netif_running(dev))
 		return 0;
 
+	flush_scheduled_work();
 	bnx2_netif_stop(bp);
 	netif_device_detach(dev);
 	del_timer_sync(&bp->timer);