[PATCH] net: macb: undo operations in case of failure

[PATCH] net: macb: undo operations in case of failure

[Claudiu Beznea]

Undo previously done operation in case macb_phylink_connect()
fails. Since macb_reset_hw() is the 1st undo operation the
napi_exit label was renamed to reset_hw.

Fixes: b2b041417299 ("net: macb: convert to phylink")
Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
---
 drivers/net/ethernet/cadence/macb_main.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
index 67933079aeea..257c4920cb88 100644
--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -2558,7 +2558,7 @@ static int macb_open(struct net_device *dev)
 
 	err = macb_phylink_connect(bp);
 	if (err)
-		goto napi_exit;
+		goto reset_hw;
 
 	netif_tx_start_all_queues(dev);
 
@@ -2567,9 +2567,11 @@ static int macb_open(struct net_device *dev)
 
 	return 0;
 
-napi_exit:
+reset_hw:
+	macb_reset_hw(bp);
 	for (q = 0, queue = bp->queues; q < bp->num_queues; ++q, ++queue)
 		napi_disable(&queue->napi);
+	macb_free_consistent(bp);
 pm_exit:
 	pm_runtime_put_sync(&bp->pdev->dev);
 	return err;
-- 
2.7.4

Re: [PATCH] net: macb: undo operations in case of failure

[Jakub Kicinski]

On Wed, 17 Jun 2020 16:23:55 +0300 Claudiu Beznea wrote:
> Undo previously done operation in case macb_phylink_connect()
> fails. Since macb_reset_hw() is the 1st undo operation the
> napi_exit label was renamed to reset_hw.
> 
> Fixes: b2b041417299 ("net: macb: convert to phylink")
> Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>

Fixes tag: Fixes: b2b041417299 ("net: macb: convert to phylink")
Has these problem(s):
	- Target SHA1 does not exist

Re: [PATCH] net: macb: undo operations in case of failure

[Nicolas Ferre]

On 17/06/2020 at 18:29, Jakub Kicinski wrote:
> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
> 
> On Wed, 17 Jun 2020 16:23:55 +0300 Claudiu Beznea wrote:
>> Undo previously done operation in case macb_phylink_connect()
>> fails. Since macb_reset_hw() is the 1st undo operation the
>> napi_exit label was renamed to reset_hw.
>>
>> Fixes: b2b041417299 ("net: macb: convert to phylink")
>> Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
> 
> Fixes tag: Fixes: b2b041417299 ("net: macb: convert to phylink")
> Has these problem(s):
>          - Target SHA1 does not exist

It must be:
Fixes: 7897b071ac3b ("net: macb: convert to phylink")


-- 
Nicolas Ferre