]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Revert "iavf: Do not restart Tx queues after reset task failure"
authorMarcin Szycik <marcin.szycik@linux.intel.com>
Mon, 5 Jun 2023 14:52:24 +0000 (10:52 -0400)
committerTony Nguyen <anthony.l.nguyen@intel.com>
Mon, 17 Jul 2023 17:20:11 +0000 (10:20 -0700)
This reverts commit 08f1c147b7265245d67321585c68a27e990e0c4b.

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>
drivers/net/ethernet/intel/iavf/iavf_main.c

index 957ad6e63f6fc621506a40405fbc1dbd3cb6a0c7..0c12a752429c439fc8c9c249ad2c7e4e4d4a3109 100644 (file)
@@ -3042,11 +3042,6 @@ static void iavf_reset_task(struct work_struct *work)
                iavf_disable_vf(adapter);
                mutex_unlock(&adapter->client_lock);
                mutex_unlock(&adapter->crit_lock);
-               if (netif_running(netdev)) {
-                       rtnl_lock();
-                       dev_close(netdev);
-                       rtnl_unlock();
-               }
                return; /* Do not attempt to reinit. It's dead, Jim. */
        }
 
@@ -3197,16 +3192,6 @@ reset_err:
 
        mutex_unlock(&adapter->client_lock);
        mutex_unlock(&adapter->crit_lock);
-
-       if (netif_running(netdev)) {
-               /* Close device to ensure that Tx queues will not be started
-                * during netif_device_attach() at the end of the reset task.
-                */
-               rtnl_lock();
-               dev_close(netdev);
-               rtnl_unlock();
-       }
-
        dev_err(&adapter->pdev->dev, "failed to allocate resources during reinit\n");
 }