diff options
| author | Thomas Falcon <tlfalcon@linux.vnet.ibm.com> | 2018-08-30 13:19:53 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-08-31 23:15:50 -0700 |
| commit | f611a5b4a51fa36a0aa792be474f5d6aacaef7e3 (patch) | |
| tree | de2613acb1d059fcc69e30dcdcebd49598059b9c /drivers/net/ethernet/ibm | |
| parent | c81c7012e0c769b5704c2b07bd5224965e76fb70 (diff) | |
| download | blackbird-obmc-linux-f611a5b4a51fa36a0aa792be474f5d6aacaef7e3.tar.gz blackbird-obmc-linux-f611a5b4a51fa36a0aa792be474f5d6aacaef7e3.zip | |
ibmvnic: Include missing return code checks in reset function
Check the return codes of these functions and halt reset
in case of failure. The driver will remain in a dormant state
until the next reset event, when device initialization will be
re-attempted.
Signed-off-by: Thomas Falcon <tlfalcon@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/ibm')
| -rw-r--r-- | drivers/net/ethernet/ibm/ibmvnic.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c index dafdd4ade705..4f0daf67b18d 100644 --- a/drivers/net/ethernet/ibm/ibmvnic.c +++ b/drivers/net/ethernet/ibm/ibmvnic.c @@ -1823,11 +1823,17 @@ static int do_reset(struct ibmvnic_adapter *adapter, adapter->map_id = 1; release_rx_pools(adapter); release_tx_pools(adapter); - init_rx_pools(netdev); - init_tx_pools(netdev); + rc = init_rx_pools(netdev); + if (rc) + return rc; + rc = init_tx_pools(netdev); + if (rc) + return rc; release_napi(adapter); - init_napi(adapter); + rc = init_napi(adapter); + if (rc) + return rc; } else { rc = reset_tx_pools(adapter); if (rc) |
