From 2f1ad9a45450a0173ed546bed95fe1d641a50f0e Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 23 Jun 2020 20:09:23 +0200 Subject: [PATCH] 4.19-stable patches added patches: revert-dpaa_eth-fix-usage-as-dsa-master-try-3.patch --- ...aa_eth-fix-usage-as-dsa-master-try-3.patch | 44 +++++++++++++++++++ queue-4.19/series | 1 + 2 files changed, 45 insertions(+) create mode 100644 queue-4.19/revert-dpaa_eth-fix-usage-as-dsa-master-try-3.patch diff --git a/queue-4.19/revert-dpaa_eth-fix-usage-as-dsa-master-try-3.patch b/queue-4.19/revert-dpaa_eth-fix-usage-as-dsa-master-try-3.patch new file mode 100644 index 00000000000..26bcfc31e65 --- /dev/null +++ b/queue-4.19/revert-dpaa_eth-fix-usage-as-dsa-master-try-3.patch @@ -0,0 +1,44 @@ +From olteanv@gmail.com Tue Jun 23 20:06:02 2020 +From: Vladimir Oltean +Date: Mon, 22 Jun 2020 13:40:41 +0300 +Subject: Revert "dpaa_eth: fix usage as DSA master, try 3" +To: stable@vger.kernel.org, gregkh@linuxfoundation.org, netdev@vger.kernel.org +Cc: madalin.bucur@oss.nxp.com, joakim.tjernlund@infinera.com, fido_max@inbox.ru, linux-kernel@vger.kernel.org +Message-ID: <20200622104041.436940-1-olteanv@gmail.com> + + +From: Vladimir Oltean + +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 +Signed-off-by: Vladimir Oltean +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c ++++ b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c +@@ -2796,7 +2796,7 @@ static int dpaa_eth_probe(struct platfor + } + + /* 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); diff --git a/queue-4.19/series b/queue-4.19/series index 2ab86801dff..ec95e0f2e64 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -203,3 +203,4 @@ net-octeon-mgmt-repair-filling-of-rx-ring.patch kretprobe-prevent-triggering-kretprobe-from-within-k.patch sched-rt-net-use-config_preemption.patch.patch net-core-device_rename-use-rwsem-instead-of-a-seqcou.patch +revert-dpaa_eth-fix-usage-as-dsa-master-try-3.patch -- 2.47.3