]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
Revert "dpaa_eth: fix usage as DSA master, try 3"
authorVladimir Oltean <vladimir.oltean@nxp.com>
Wed, 24 Jun 2020 12:45:17 +0000 (15:45 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 31 Jul 2020 16:39:32 +0000 (18:39 +0200)
This reverts commit 40a904b1c2e57b22dd002dfce73688871cb0bac8.

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 tag --contains 060ad66f97954
v5.5

which then means it should have not been backported to linux-5.4.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 cd9d08695cc190ef5550a264e6fe760d0dc40070..00c4beb760c357132b9c70d883cf9d079421c149 100644 (file)
@@ -2802,7 +2802,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);