From: Don Skidmore <donald.c.skidmore@intel.com>
Date: Tue, 12 Jul 2016 22:47:38 +0000 (-0400)
Subject: ixgbevf: Protect ixgbevf_reset_subtask from remove event
X-Git-Tag: v4.1.12-92~2^2~159
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a43d7ba06d5497bc1e17ca907fe048c4d3d31163;p=users%2Fjedix%2Flinux-maple.git

ixgbevf: Protect ixgbevf_reset_subtask from remove event

Orabug: 24568240

In ixgbevf_reset_subtask We weren't verifying that the port haven't
been removed, we are with this patch.

Signed-off-by: Don Skidmore <donald.c.skidmore@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit 6e469ed03ed9b21b0c2dd46f77113a85f3e2bea6)
Signed-off-by: Brian Maly <brian.maly@oracle.com>
---

diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
index 1cfa5fee0091..9fb0f665750a 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
@@ -2773,6 +2773,7 @@ static void ixgbevf_reset_subtask(struct ixgbevf_adapter *adapter)
 
 	/* If we're already down or resetting, just bail */
 	if (test_bit(__IXGBEVF_DOWN, &adapter->state) ||
+	    test_bit(__IXGBEVF_REMOVING, &adapter->state) ||
 	    test_bit(__IXGBEVF_RESETTING, &adapter->state))
 		return;