From: Andrew Morton Convert tg3 over to flush_work_keventd(). Remove nasty now-unneeded deadlock avoidance logic. Cc: "Maciej W. Rozycki" Cc: David Howells Cc: "David S. Miller" Cc: Michael Chan Cc: Jeff Garzik Cc: Oleg Nesterov Signed-off-by: Andrew Morton --- drivers/net/tg3.c | 11 +---------- drivers/net/tg3.h | 2 +- 2 files changed, 2 insertions(+), 11 deletions(-) diff -puN drivers/net/tg3.c~tg3-use-flush_keventd_work drivers/net/tg3.c --- a/drivers/net/tg3.c~tg3-use-flush_keventd_work +++ a/drivers/net/tg3.c @@ -3685,10 +3685,8 @@ static void tg3_reset_task(struct work_s unsigned int restart_timer; tg3_full_lock(tp, 0); - tp->tg3_flags |= TG3_FLAG_IN_RESET_TASK; if (!netif_running(tp->dev)) { - tp->tg3_flags &= ~TG3_FLAG_IN_RESET_TASK; tg3_full_unlock(tp); return; } @@ -3719,8 +3717,6 @@ static void tg3_reset_task(struct work_s mod_timer(&tp->timer, jiffies + 1); out: - tp->tg3_flags &= ~TG3_FLAG_IN_RESET_TASK; - tg3_full_unlock(tp); } @@ -7340,12 +7336,7 @@ static int tg3_close(struct net_device * { struct tg3 *tp = netdev_priv(dev); - /* Calling flush_scheduled_work() may deadlock because - * linkwatch_event() may be on the workqueue and it will try to get - * the rtnl_lock which we are holding. - */ - while (tp->tg3_flags & TG3_FLAG_IN_RESET_TASK) - msleep(1); + flush_work_keventd(&tp->reset_task); netif_stop_queue(dev); diff -puN drivers/net/tg3.h~tg3-use-flush_keventd_work drivers/net/tg3.h --- a/drivers/net/tg3.h~tg3-use-flush_keventd_work +++ a/drivers/net/tg3.h @@ -2218,7 +2218,7 @@ struct tg3 { #define TG3_FLAG_JUMBO_RING_ENABLE 0x00800000 #define TG3_FLAG_10_100_ONLY 0x01000000 #define TG3_FLAG_PAUSE_AUTONEG 0x02000000 -#define TG3_FLAG_IN_RESET_TASK 0x04000000 + #define TG3_FLAG_40BIT_DMA_BUG 0x08000000 #define TG3_FLAG_BROKEN_CHECKSUMS 0x10000000 #define TG3_FLAG_GOT_SERDES_FLOWCTL 0x20000000 _