From: Michael Chan <mchan@broadcom.com>
Date: Tue, 21 Mar 2006 01:50:08 +0000 (-0800)
Subject: [BNX2]: Update version
X-Git-Tag: v2.6.17-rc1~1175^2~176
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=1d60290f27e7dc4bce2c43922d0bfa9abd246fc9;p=~shefty%2Frdma-dev.git

[BNX2]: Update version

Update version to 1.4.37.

Add missing flush_scheduled_work() in bnx2_suspend as noted by Jeff
Garzik.

Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index b36515e9537..1f4b788245f 100644
--- a/drivers/net/bnx2.c
+++ b/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);