diff options
| author | David Howells <dhowells@redhat.com> | 2019-09-02 11:43:44 +0100 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2019-09-02 11:43:44 +0100 |
| commit | f16180739cd18a39a1a45516ac0e65d18a9f100e (patch) | |
| tree | 22d1135650f8ddb25707c788cd4846c77b428ff0 /drivers/net/ethernet/ibm/ibmvnic.c | |
| parent | 9f159ae07f07fc540290f21937231034f554bdd7 (diff) | |
| parent | e1e54ec7fb55501c33b117c111cb0a045b8eded2 (diff) | |
| download | kernel_replicant_linux-f16180739cd18a39a1a45516ac0e65d18a9f100e.tar.gz kernel_replicant_linux-f16180739cd18a39a1a45516ac0e65d18a9f100e.tar.bz2 kernel_replicant_linux-f16180739cd18a39a1a45516ac0e65d18a9f100e.zip | |
Merge remote-tracking branch 'net/master' into afs-next
Diffstat (limited to 'drivers/net/ethernet/ibm/ibmvnic.c')
| -rw-r--r-- | drivers/net/ethernet/ibm/ibmvnic.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c index cebd20f3128d..fa4bb940665c 100644 --- a/drivers/net/ethernet/ibm/ibmvnic.c +++ b/drivers/net/ethernet/ibm/ibmvnic.c @@ -1983,6 +1983,10 @@ static void __ibmvnic_reset(struct work_struct *work) rwi = get_next_rwi(adapter); while (rwi) { + if (adapter->state == VNIC_REMOVING || + adapter->state == VNIC_REMOVED) + goto out; + if (adapter->force_reset_recovery) { adapter->force_reset_recovery = false; rc = do_hard_reset(adapter, rwi, reset_state); @@ -2007,7 +2011,7 @@ static void __ibmvnic_reset(struct work_struct *work) netdev_dbg(adapter->netdev, "Reset failed\n"); free_all_rwi(adapter); } - +out: adapter->resetting = false; if (we_lock_rtnl) rtnl_unlock(); |