mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-30 08:02:30 +00:00
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: 014406babc
("net: cadence: macb: disable NAPI on error")
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Tested-by: Corentin Labbe <clabbe@baylibre.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
0acb47a3a0
commit
939a5bf7c9
1 changed files with 4 additions and 5 deletions
|
@ -2565,15 +2565,14 @@ static int macb_open(struct net_device *dev)
|
|||
if (bp->ptp_info)
|
||||
bp->ptp_info->ptp_init(dev);
|
||||
|
||||
return 0;
|
||||
|
||||
napi_exit:
|
||||
for (q = 0, queue = bp->queues; q < bp->num_queues; ++q, ++queue)
|
||||
napi_disable(&queue->napi);
|
||||
pm_exit:
|
||||
if (err) {
|
||||
pm_runtime_put_sync(&bp->pdev->dev);
|
||||
return err;
|
||||
}
|
||||
return 0;
|
||||
pm_runtime_put_sync(&bp->pdev->dev);
|
||||
return err;
|
||||
}
|
||||
|
||||
static int macb_close(struct net_device *dev)
|
||||
|
|
Loading…
Reference in a new issue