Commit 3578a7ec authored by John Allen's avatar John Allen Committed by David S. Miller

ibmvnic: Fix error recovery on login failure

Testing has uncovered a failure case that is not handled properly. In the
event that a login fails and we are not able to recover on the spot, we
return 0 from do_reset, preventing any error recovery code from being
triggered.  Additionally, the state is set to "probed" meaning that when we
are able to trigger the error recovery, the driver always comes up in the
probed state. To handle the case properly, we need to return a failure code
here and set the adapter state to the state that we entered the reset in
indicating the state that we would like to come out of the recovery reset
in.
Signed-off-by: default avatarJohn Allen <jallen@linux.vnet.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent dea39aca
...@@ -1827,8 +1827,8 @@ static int do_reset(struct ibmvnic_adapter *adapter, ...@@ -1827,8 +1827,8 @@ static int do_reset(struct ibmvnic_adapter *adapter,
rc = ibmvnic_login(netdev); rc = ibmvnic_login(netdev);
if (rc) { if (rc) {
adapter->state = VNIC_PROBED; adapter->state = reset_state;
return 0; return rc;
} }
if (adapter->reset_reason == VNIC_RESET_CHANGE_PARAM || if (adapter->reset_reason == VNIC_RESET_CHANGE_PARAM ||
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment