diff options
| author | Michael Chan <mchan@broadcom.com> | 2006-03-20 17:50:08 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2006-03-20 17:50:08 -0800 |
| commit | 1d60290f27e7dc4bce2c43922d0bfa9abd246fc9 (patch) | |
| tree | fefe7222a552b8d54d2844fc4800c3a338ef356c /drivers | |
| parent | 3fdfcc2c95ffc7ee04b480a4c1fd4809b5ff2f7c (diff) | |
| download | op-kernel-dev-1d60290f27e7dc4bce2c43922d0bfa9abd246fc9.zip op-kernel-dev-1d60290f27e7dc4bce2c43922d0bfa9abd246fc9.tar.gz | |
[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>
Diffstat (limited to 'drivers')
| -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 b36515e..1f4b788 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); |
