Skip to content

Commit d916d27

Browse files
Marcin Szycikanguy11
authored andcommitted
Revert "iavf: Do not restart Tx queues after reset task failure"
This reverts commit 08f1c14. Netdev is no longer being detached during reset, so this fix can be reverted. We leave the removal of "hacky" IFF_UP flag update. Signed-off-by: Marcin Szycik <[email protected]> Signed-off-by: Mateusz Palczewski <[email protected]> Tested-by: Rafal Romanowski <[email protected]> Signed-off-by: Tony Nguyen <[email protected]>
1 parent d2806d9 commit d916d27

File tree

1 file changed

+0
-15
lines changed

1 file changed

+0
-15
lines changed

drivers/net/ethernet/intel/iavf/iavf_main.c

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3042,11 +3042,6 @@ static void iavf_reset_task(struct work_struct *work)
30423042
iavf_disable_vf(adapter);
30433043
mutex_unlock(&adapter->client_lock);
30443044
mutex_unlock(&adapter->crit_lock);
3045-
if (netif_running(netdev)) {
3046-
rtnl_lock();
3047-
dev_close(netdev);
3048-
rtnl_unlock();
3049-
}
30503045
return; /* Do not attempt to reinit. It's dead, Jim. */
30513046
}
30523047

@@ -3197,16 +3192,6 @@ static void iavf_reset_task(struct work_struct *work)
31973192

31983193
mutex_unlock(&adapter->client_lock);
31993194
mutex_unlock(&adapter->crit_lock);
3200-
3201-
if (netif_running(netdev)) {
3202-
/* Close device to ensure that Tx queues will not be started
3203-
* during netif_device_attach() at the end of the reset task.
3204-
*/
3205-
rtnl_lock();
3206-
dev_close(netdev);
3207-
rtnl_unlock();
3208-
}
3209-
32103195
dev_err(&adapter->pdev->dev, "failed to allocate resources during reinit\n");
32113196
}
32123197

0 commit comments

Comments
 (0)