Skip to content

Commit df03610

Browse files
committed
Revert "iavf: Do not restart Tx queues after reset task failure"
jira LE-1907 Rebuild_History Non-Buildable kernel-5.14.0-284.30.1.el9_2 commit-author Marcin Szycik <marcin.szycik@linux.intel.com> commit d916d27 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 <marcin.szycik@linux.intel.com> Signed-off-by: Mateusz Palczewski <mateusz.palczewski@intel.com> Tested-by: Rafal Romanowski <rafal.romanowski@intel.com> Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com> (cherry picked from commit d916d27) Signed-off-by: Jonathan Maple <jmaple@ciq.com>
1 parent b0ef7e4 commit df03610

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
@@ -3039,11 +3039,6 @@ static void iavf_reset_task(struct work_struct *work)
30393039
iavf_disable_vf(adapter);
30403040
mutex_unlock(&adapter->client_lock);
30413041
mutex_unlock(&adapter->crit_lock);
3042-
if (netif_running(netdev)) {
3043-
rtnl_lock();
3044-
dev_close(netdev);
3045-
rtnl_unlock();
3046-
}
30473042
return; /* Do not attempt to reinit. It's dead, Jim. */
30483043
}
30493044

@@ -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)