diff options
author | Jakub Kicinski <kuba@kernel.org> | 2021-09-16 13:58:38 -0700 |
---|---|---|
committer | Jakub Kicinski <kuba@kernel.org> | 2021-09-16 13:58:38 -0700 |
commit | 561bed688bffedd6bbdfa70af7a4f64f0a3e2140 (patch) | |
tree | 19256b7a70dcdb9a95c4a7494a0b8bb9db10ef30 /drivers/net/ethernet/ibm/ibmvnic.c | |
parent | octeontx2-af: Hardware configuration for inline IPsec (diff) | |
parent | Merge tag 'net-5.15-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (diff) | |
download | linux-dev-561bed688bffedd6bbdfa70af7a4f64f0a3e2140.tar.xz linux-dev-561bed688bffedd6bbdfa70af7a4f64f0a3e2140.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
No conflicts!
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/ibm/ibmvnic.c')
-rw-r--r-- | drivers/net/ethernet/ibm/ibmvnic.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c index d1be883f933a..8f17096e614d 100644 --- a/drivers/net/ethernet/ibm/ibmvnic.c +++ b/drivers/net/ethernet/ibm/ibmvnic.c @@ -4890,6 +4890,22 @@ static int handle_login_rsp(union ibmvnic_crq *login_rsp_crq, return 0; } + if (adapter->failover_pending) { + adapter->init_done_rc = -EAGAIN; + netdev_dbg(netdev, "Failover pending, ignoring login response\n"); + complete(&adapter->init_done); + /* login response buffer will be released on reset */ + return 0; + } + + if (adapter->failover_pending) { + adapter->init_done_rc = -EAGAIN; + netdev_dbg(netdev, "Failover pending, ignoring login response\n"); + complete(&adapter->init_done); + /* login response buffer will be released on reset */ + return 0; + } + netdev->mtu = adapter->req_mtu - ETH_HLEN; netdev_dbg(adapter->netdev, "Login Response Buffer:\n"); |