diff options
| author | Charles Keepax <ckeepax@opensource.cirrus.com> | 2020-06-15 15:18:54 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-06-15 22:10:34 +0200 |
| commit | 939a5bf7c9b7a1ad9c5d3481c93766a522773531 (patch) | |
| tree | a3a96e28c186314ff7db97a346b6252345e90fae | |
| parent | qlcnic: Use kobj_to_dev() instead (diff) | |
| download | linux-939a5bf7c9b7a1ad9c5d3481c93766a522773531.tar.xz linux-939a5bf7c9b7a1ad9c5d3481c93766a522773531.zip | |
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: 014406babc1f ("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>
| -rw-r--r-- | drivers/net/ethernet/cadence/macb_main.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index 5b9d7c60eebc..67933079aeea 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -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) |