Revert "dpaa_eth: fix usage as DSA master, try 3"
authorVladimir Oltean <vladimir.oltean@nxp.com>
Mon, 22 Jun 2020 10:40:41 +0000 (13:40 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 25 Jun 2020 13:33:10 +0000 (15:33 +0200)
This reverts commit b145710b69388aa4034d32b4a937f18f66b5538e which is
commit 5d14c304bfc14b4fd052dc83d5224376b48f52f0 upstream.

The patch is not wrong, but the Fixes: tag is. It should have been:

Fixes: 060ad66f9795 ("dpaa_eth: change DMA device")
which means that it's fixing a commit which was introduced in:

git describe --tags 060ad66f97954
v5.4-rc3-783-g060ad66f9795

which then means it should have not been backported to linux-4.19.y,
where things _were_ working and now they're not.

Reported-by: Joakim Tjernlund <joakim.tjernlund@infinera.com>
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/net/ethernet/freescale/dpaa/dpaa_eth.c

index 6683409fbd4a92e877516b8776520eff8aa674a1..4b21ae27a9fdea924b9f4c4e8bd993e373a932f9 100644 (file)
@@ -2796,7 +2796,7 @@ static int dpaa_eth_probe(struct platform_device *pdev)
        }
 
        /* Do this here, so we can be verbose early */
-       SET_NETDEV_DEV(net_dev, dev->parent);
+       SET_NETDEV_DEV(net_dev, dev);
        dev_set_drvdata(dev, net_dev);
 
        priv = netdev_priv(net_dev);