diff options
| author | Andrew Morton <akpm@osdl.org> | 2007-05-09 05:33:58 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-09 15:30:51 -0400 |
| commit | d9ef8b92887c35f113cb749270530f87961f7a0a (patch) | |
| tree | 3304f44495736878874dbb41a516ab074bc656ea /drivers/net | |
| parent | 2b3cb2e778811a1df99e37fd7c359837501ab103 (diff) | |
e1000: use flush_work_keventd()
Switch e1000 over to flush_work_keventd(). This probably fixes a netdev-close
versus linkwatch rtnl_lock() deadlock which nobody knew about.
(akpm: bypassed maintainers, sorry. There are other patches which depend on
this)
Cc: "Maciej W. Rozycki" <macro@linux-mips.org>
Cc: David Howells <dhowells@redhat.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jeff Garzik <jeff@garzik.org>
Acked-by: Auke Kok <auke-jan.h.kok@intel.com>
Cc: Oleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/e1000/e1000_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c index 3a03a74c0609..397e25bdbfec 100644 --- a/drivers/net/e1000/e1000_main.c +++ b/drivers/net/e1000/e1000_main.c | |||
| @@ -1214,7 +1214,7 @@ e1000_remove(struct pci_dev *pdev) | |||
| 1214 | int i; | 1214 | int i; |
| 1215 | #endif | 1215 | #endif |
| 1216 | 1216 | ||
| 1217 | flush_scheduled_work(); | 1217 | flush_work_keventd(&adapter->reset_task); |
| 1218 | 1218 | ||
| 1219 | e1000_release_manageability(adapter); | 1219 | e1000_release_manageability(adapter); |
| 1220 | 1220 | ||