summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLijun Pan <ljp@linux.ibm.com>2020-08-20 01:52:25 +0300
committerDavid S. Miller <davem@davemloft.net>2020-08-27 02:11:33 +0300
commit550f4d46aff6fe57c9b1c6719c3c9de2237d7ac2 (patch)
tree4637917078b8317ca361d9222fd6c125a8babbaa /drivers
parentfa68bfab1e716ee15a08d0e1ec284d6340736451 (diff)
downloadlinux-550f4d46aff6fe57c9b1c6719c3c9de2237d7ac2.tar.xz
ibmvnic: remove never executed if statement
At the beginning of the function, from_passive_init is set false by "adapter->from_passive_init = false;", hence the if statement will never run. Signed-off-by: Lijun Pan <ljp@linux.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ethernet/ibm/ibmvnic.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
index 4e0a6cbd1488..15e5b26933fe 100644
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -5017,12 +5017,6 @@ static int ibmvnic_reset_init(struct ibmvnic_adapter *adapter)
return adapter->init_done_rc;
}
- if (adapter->from_passive_init) {
- adapter->state = VNIC_OPEN;
- adapter->from_passive_init = false;
- return -1;
- }
-
if (test_bit(0, &adapter->resetting) && !adapter->wait_for_reset &&
adapter->reset_reason != VNIC_RESET_MOBILITY) {
if (adapter->req_rx_queues != old_num_rx_queues ||
@@ -5076,12 +5070,6 @@ static int ibmvnic_init(struct ibmvnic_adapter *adapter)
return adapter->init_done_rc;
}
- if (adapter->from_passive_init) {
- adapter->state = VNIC_OPEN;
- adapter->from_passive_init = false;
- return -1;
- }
-
rc = init_sub_crqs(adapter);
if (rc) {
dev_err(dev, "Initialization of sub crqs failed\n");