projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3fdfcc2
)
[BNX2]: Update version
author
Michael Chan
<
[email protected]
>
Tue, 21 Mar 2006 01:50:08 +0000
(17:50 -0800)
committer
David S. Miller
<
[email protected]
>
Tue, 21 Mar 2006 01:50:08 +0000
(17:50 -0800)
Update version to 1.4.37.
Add missing flush_scheduled_work() in bnx2_suspend as noted by Jeff
Garzik.
Signed-off-by: Michael Chan <
[email protected]
>
Signed-off-by: David S. Miller <
[email protected]
>
drivers/net/bnx2.c
patch
|
blob
|
history
diff --git
a/drivers/net/bnx2.c
b/drivers/net/bnx2.c
index b36515e95376d3a805c72435edb27909a4da02c3..1f4b788245f1c6090ea9e12be988295a0032676c 100644
(file)
--- 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.3
1
"
-#define DRV_MODULE_RELDATE "
January 19
, 2006"
+#define DRV_MODULE_VERSION "1.4.3
7
"
+#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);