diff options
author | Michael Chan <mchan@broadcom.com> | 2006-03-20 20:50:08 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2006-03-20 20:50:08 -0500 |
commit | 1d60290f27e7dc4bce2c43922d0bfa9abd246fc9 (patch) | |
tree | fefe7222a552b8d54d2844fc4800c3a338ef356c | |
parent | 3fdfcc2c95ffc7ee04b480a4c1fd4809b5ff2f7c (diff) |
[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>
-rw-r--r-- | drivers/net/bnx2.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c index b36515e95376..1f4b788245f1 100644 --- a/drivers/net/bnx2.c +++ b/drivers/net/bnx2.c | |||
@@ -14,8 +14,8 @@ | |||
14 | 14 | ||
15 | #define DRV_MODULE_NAME "bnx2" | 15 | #define DRV_MODULE_NAME "bnx2" |
16 | #define PFX DRV_MODULE_NAME ": " | 16 | #define PFX DRV_MODULE_NAME ": " |
17 | #define DRV_MODULE_VERSION "1.4.31" | 17 | #define DRV_MODULE_VERSION "1.4.37" |
18 | #define DRV_MODULE_RELDATE "January 19, 2006" | 18 | #define DRV_MODULE_RELDATE "February 1, 2006" |
19 | 19 | ||
20 | #define RUN_AT(x) (jiffies + (x)) | 20 | #define RUN_AT(x) (jiffies + (x)) |
21 | 21 | ||
@@ -5765,6 +5765,7 @@ bnx2_suspend(struct pci_dev *pdev, pm_message_t state) | |||
5765 | if (!netif_running(dev)) | 5765 | if (!netif_running(dev)) |
5766 | return 0; | 5766 | return 0; |
5767 | 5767 | ||
5768 | flush_scheduled_work(); | ||
5768 | bnx2_netif_stop(bp); | 5769 | bnx2_netif_stop(bp); |
5769 | netif_device_detach(dev); | 5770 | netif_device_detach(dev); |
5770 | del_timer_sync(&bp->timer); | 5771 | del_timer_sync(&bp->timer); |