| From 82be0b05e5aeb01190badf28ef815d34e5626e81 Mon Sep 17 00:00:00 2001 |
| From: Vladimir Oltean <vladimir.oltean@nxp.com> |
| Date: Wed, 24 Jun 2020 15:45:17 +0300 |
| Subject: [PATCH] Revert "dpaa_eth: fix usage as DSA master, try 3" |
| |
| This reverts commit e930ef001d91b6c8446e52719966cc86c46e29a0 which was |
| 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 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> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c |
| index ecf9cc1ffafa..1315cc42c88f 100644 |
| --- a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c |
| +++ b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c |
| @@ -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); |
| -- |
| 2.27.0 |
| |
