Commit d9ef8b92 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

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: default avatarAuke Kok <auke-jan.h.kok@intel.com>
Cc: Oleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 2b3cb2e7
...@@ -1214,7 +1214,7 @@ e1000_remove(struct pci_dev *pdev) ...@@ -1214,7 +1214,7 @@ e1000_remove(struct pci_dev *pdev)
int i; int i;
#endif #endif
flush_scheduled_work(); flush_work_keventd(&adapter->reset_task);
e1000_release_manageability(adapter); e1000_release_manageability(adapter);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment