|
@@ -11103,11 +11103,13 @@ static void tg3_reset_task(struct work_struct *work)
|
|
struct tg3 *tp = container_of(work, struct tg3, reset_task);
|
|
struct tg3 *tp = container_of(work, struct tg3, reset_task);
|
|
int err;
|
|
int err;
|
|
|
|
|
|
|
|
+ rtnl_lock();
|
|
tg3_full_lock(tp, 0);
|
|
tg3_full_lock(tp, 0);
|
|
|
|
|
|
if (!netif_running(tp->dev)) {
|
|
if (!netif_running(tp->dev)) {
|
|
tg3_flag_clear(tp, RESET_TASK_PENDING);
|
|
tg3_flag_clear(tp, RESET_TASK_PENDING);
|
|
tg3_full_unlock(tp);
|
|
tg3_full_unlock(tp);
|
|
|
|
+ rtnl_unlock();
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -11140,6 +11142,7 @@ out:
|
|
tg3_phy_start(tp);
|
|
tg3_phy_start(tp);
|
|
|
|
|
|
tg3_flag_clear(tp, RESET_TASK_PENDING);
|
|
tg3_flag_clear(tp, RESET_TASK_PENDING);
|
|
|
|
+ rtnl_unlock();
|
|
}
|
|
}
|
|
|
|
|
|
static int tg3_request_irq(struct tg3 *tp, int irq_num)
|
|
static int tg3_request_irq(struct tg3 *tp, int irq_num)
|