|
Michal Suchanek |
9bda32 |
From 8ae4dff882eb879c17bf46574201bd37fc6bc8b5 Mon Sep 17 00:00:00 2001
|
|
Michal Suchanek |
9bda32 |
From: Jakub Kicinski <kuba@kernel.org>
|
|
Michal Suchanek |
9bda32 |
Date: Fri, 4 Sep 2020 21:07:49 -0700
|
|
Michal Suchanek |
9bda32 |
Subject: [PATCH] ibmvnic: add missing parenthesis in do_reset()
|
|
Michal Suchanek |
9bda32 |
|
|
Michal Suchanek |
9bda32 |
References: bsc#1176700 ltc#188140
|
|
Michal Suchanek |
609e68 |
Patch-mainline: v5.9-rc7
|
|
Michal Suchanek |
9bda32 |
Git-commit: 8ae4dff882eb879c17bf46574201bd37fc6bc8b5
|
|
Michal Suchanek |
9bda32 |
|
|
Michal Suchanek |
9bda32 |
Indentation and logic clearly show that this code is missing
|
|
Michal Suchanek |
9bda32 |
parenthesis.
|
|
Michal Suchanek |
9bda32 |
|
|
Michal Suchanek |
9bda32 |
Fixes: 9f1345737790 ("ibmvnic fix NULL tx_pools and rx_tools issue at do_reset")
|
|
Michal Suchanek |
9bda32 |
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
Michal Suchanek |
9bda32 |
Acked-by: Michal Suchanek <msuchanek@suse.de>
|
|
Michal Suchanek |
9bda32 |
---
|
|
Michal Suchanek |
9bda32 |
drivers/net/ethernet/ibm/ibmvnic.c | 6 ++++--
|
|
Michal Suchanek |
9bda32 |
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
Michal Suchanek |
9bda32 |
|
|
Michal Suchanek |
9bda32 |
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
|
|
Michal Suchanek |
9bda32 |
index d3a774331afc..1b702a43a5d0 100644
|
|
Michal Suchanek |
9bda32 |
--- a/drivers/net/ethernet/ibm/ibmvnic.c
|
|
Michal Suchanek |
9bda32 |
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
|
|
Michal Suchanek |
9bda32 |
@@ -2032,16 +2032,18 @@ static int do_reset(struct ibmvnic_adapter *adapter,
|
|
Michal Suchanek |
9bda32 |
|
|
Michal Suchanek |
9bda32 |
} else {
|
|
Michal Suchanek |
9bda32 |
rc = reset_tx_pools(adapter);
|
|
Michal Suchanek |
9bda32 |
- if (rc)
|
|
Michal Suchanek |
9bda32 |
+ if (rc) {
|
|
Michal Suchanek |
9bda32 |
netdev_dbg(adapter->netdev, "reset tx pools failed (%d)\n",
|
|
Michal Suchanek |
9bda32 |
rc);
|
|
Michal Suchanek |
9bda32 |
goto out;
|
|
Michal Suchanek |
9bda32 |
+ }
|
|
Michal Suchanek |
9bda32 |
|
|
Michal Suchanek |
9bda32 |
rc = reset_rx_pools(adapter);
|
|
Michal Suchanek |
9bda32 |
- if (rc)
|
|
Michal Suchanek |
9bda32 |
+ if (rc) {
|
|
Michal Suchanek |
9bda32 |
netdev_dbg(adapter->netdev, "reset rx pools failed (%d)\n",
|
|
Michal Suchanek |
9bda32 |
rc);
|
|
Michal Suchanek |
9bda32 |
goto out;
|
|
Michal Suchanek |
9bda32 |
+ }
|
|
Michal Suchanek |
9bda32 |
}
|
|
Michal Suchanek |
9bda32 |
ibmvnic_disable_irqs(adapter);
|
|
Michal Suchanek |
9bda32 |
}
|
|
Michal Suchanek |
9bda32 |
--
|
|
Michal Suchanek |
9bda32 |
2.28.0
|
|
Michal Suchanek |
9bda32 |
|