aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Falcon <tlfalcon@linux.vnet.ibm.com>2018-05-16 16:49:04 -0400
committerDavid S. Miller <davem@davemloft.net>2018-05-17 14:57:19 -0400
commit134bbe7f21f4455c8be64f945b8b67094f768de0 (patch)
tree754e6e5240e86bea94ab817797159b0239b230da
parent4cf2ddf3e329d4ec1e3edda3465a202b5665be0e (diff)
ibmvnic: Fix non-fatal firmware error reset
It is not necessary to disable interrupt lines here during a reset to handle a non-fatal firmware error. Move that call within the code block that handles the other cases that do require interrupts to be disabled and re-enabled. Signed-off-by: Thomas Falcon <tlfalcon@linux.vnet.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/ibm/ibmvnic.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
index 9e08917cda1f..1b9c22f28fbf 100644
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -1822,9 +1822,8 @@ static int do_reset(struct ibmvnic_adapter *adapter,
1822 if (rc) 1822 if (rc)
1823 return rc; 1823 return rc;
1824 } 1824 }
1825 ibmvnic_disable_irqs(adapter);
1825 } 1826 }
1826
1827 ibmvnic_disable_irqs(adapter);
1828 adapter->state = VNIC_CLOSED; 1827 adapter->state = VNIC_CLOSED;
1829 1828
1830 if (reset_state == VNIC_CLOSED) 1829 if (reset_state == VNIC_CLOSED)