Commit 939a5bf7 authored by Charles Keepax's avatar Charles Keepax Committed by David S. Miller

net: macb: Only disable NAPI on the actual error path

A recent change added a disable to NAPI into macb_open, this was
intended to only happen on the error path but accidentally applies
to all paths. This causes NAPI to be disabled on the success path, which
leads to the network to no longer functioning.

Fixes: 014406ba ("net: cadence: macb: disable NAPI on error")
Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Tested-by: default avatarCorentin Labbe <clabbe@baylibre.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0acb47a3
...@@ -2565,15 +2565,14 @@ static int macb_open(struct net_device *dev) ...@@ -2565,15 +2565,14 @@ static int macb_open(struct net_device *dev)
if (bp->ptp_info) if (bp->ptp_info)
bp->ptp_info->ptp_init(dev); bp->ptp_info->ptp_init(dev);
return 0;
napi_exit: napi_exit:
for (q = 0, queue = bp->queues; q < bp->num_queues; ++q, ++queue) for (q = 0, queue = bp->queues; q < bp->num_queues; ++q, ++queue)
napi_disable(&queue->napi); napi_disable(&queue->napi);
pm_exit: pm_exit:
if (err) { pm_runtime_put_sync(&bp->pdev->dev);
pm_runtime_put_sync(&bp->pdev->dev); return err;
return err;
}
return 0;
} }
static int macb_close(struct net_device *dev) static int macb_close(struct net_device *dev)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment