Commit e65dd528 authored Jun 07, 2019 by Thomas Falcon Committed by Greg Kroah-Hartman Jul 14, 2019

ibmvnic: Do not close unopened driver during reset



[ Upstream commit 1f94608b0ce141be5286dde31270590bdf35b86a ]

Check driver state before halting it during a reset. If the driver is
not running, do nothing. Otherwise, a request to deactivate a down link
can cause an error and the reset will fail.

Signed-off-by: Thomas Falcon <tlfalcon@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 374180b1

drivers/net/ethernet/ibm/ibmvnic.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1754,7 +1754,8 @@ static int do_reset(struct ibmvnic_adapter *adapter,

		ibmvnic_cleanup(netdev);

		if (adapter->reset_reason != VNIC_RESET_MOBILITY &&
		if (reset_state == VNIC_OPEN &&
		adapter->reset_reason != VNIC_RESET_MOBILITY &&
		adapter->reset_reason != VNIC_RESET_FAILOVER) {
		rc = __ibmvnic_close(netdev);
		if (rc)