2 files changed, 8 insertions, 3 deletions

diff --git a/drivers/net/ethernet/intel/i40evf/i40evf.h b/drivers/net/ethernet/intel/i40evf/i40evf.h
index ccb43d343543..807807d62387 100644
--- a/drivers/net/ethernet/intel/i40evf/i40evf.h
+++ b/drivers/net/ethernet/intel/i40evf/i40evf.h
@@ -211,6 +211,7 @@ struct i40evf_adapter {
 #define I40EVF_FLAG_NEED_LINK_UPDATE             (u32)(1 << 7)
 #define I40EVF_FLAG_PF_COMMS_FAILED              (u32)(1 << 8)
 #define I40EVF_FLAG_RESET_PENDING                (u32)(1 << 9)
+#define I40EVF_FLAG_RESET_NEEDED                 (u32)(1 << 10)
 /* duplcates for common code */
 #define I40E_FLAG_FDIR_ATR_ENABLED               0
 #define I40E_FLAG_DCB_ENABLED                    0
diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
index d3eafa320ba9..51c84c19d2be 100644
--- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c
+++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
@@ -169,9 +169,7 @@ static void i40evf_tx_timeout(struct net_device *netdev)
         adapter->tx_timeout_count++;
         dev_info(&adapter->pdev->dev, "TX timeout detected.\n");
         if (!(adapter->flags & I40EVF_FLAG_RESET_PENDING)) {
-                dev_info(&adapter->pdev->dev, "Requesting reset from PF\n");
-                i40evf_request_reset(adapter);
-                adapter->flags |= I40EVF_FLAG_RESET_PENDING;
+                adapter->flags |= I40EVF_FLAG_RESET_NEEDED;
                 schedule_work(&adapter->reset_task);
         }
 }
@@ -1484,6 +1482,12 @@ static void i40evf_reset_task(struct work_struct *work)
         while (test_and_set_bit(__I40EVF_IN_CRITICAL_TASK,
                                 &adapter->crit_section))
                 udelay(500);
+
+        if (adapter->flags & I40EVF_FLAG_RESET_NEEDED) {
+                dev_info(&adapter->pdev->dev, "Requesting reset from PF\n");
+                i40evf_request_reset(adapter);
+        }
+
         /* poll until we see the reset actually happen */
         for (i = 0; i < I40EVF_RESET_WAIT_COUNT; i++) {
                 rstat_val = rd32(hw, I40E_VFGEN_RSTAT) &