diff options
author | Daniel Golle <daniel@makrotopia.org> | 2022-03-21 01:16:48 +0000 |
---|---|---|
committer | Daniel Golle <daniel@makrotopia.org> | 2022-03-21 13:11:56 +0000 |
commit | 786bf7fdaca4c75e7eba6e9aa3a8b5775fd21186 (patch) | |
tree | 926fecb2b1f6ce1e42ba7ef4c7aab8e68dfd214c /target/linux/layerscape/patches-5.4/701-net-0344-staging-dpaa2-ethsw-move-port-switchdev-notifier-per.patch | |
parent | 9470160c350d15f765c33d6c1db15d6c4709a64c (diff) | |
download | upstream-786bf7fdaca4c75e7eba6e9aa3a8b5775fd21186.tar.gz upstream-786bf7fdaca4c75e7eba6e9aa3a8b5775fd21186.tar.bz2 upstream-786bf7fdaca4c75e7eba6e9aa3a8b5775fd21186.zip |
kernel: delete Linux 5.4 config and patches
As the upcoming release will be based on Linux 5.10 only, remove all
kernel configuration as well as patches for Linux 5.4.
There were no targets still actively using Linux 5.4.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
(cherry picked from commit 3a14580411adfb75f9a44eded9f41245b9e44606)
Diffstat (limited to 'target/linux/layerscape/patches-5.4/701-net-0344-staging-dpaa2-ethsw-move-port-switchdev-notifier-per.patch')
-rw-r--r-- | target/linux/layerscape/patches-5.4/701-net-0344-staging-dpaa2-ethsw-move-port-switchdev-notifier-per.patch | 68 |
1 files changed, 0 insertions, 68 deletions
diff --git a/target/linux/layerscape/patches-5.4/701-net-0344-staging-dpaa2-ethsw-move-port-switchdev-notifier-per.patch b/target/linux/layerscape/patches-5.4/701-net-0344-staging-dpaa2-ethsw-move-port-switchdev-notifier-per.patch deleted file mode 100644 index 459d145afc..0000000000 --- a/target/linux/layerscape/patches-5.4/701-net-0344-staging-dpaa2-ethsw-move-port-switchdev-notifier-per.patch +++ /dev/null @@ -1,68 +0,0 @@ -From e35e9d1a3dd2cc4f06f03ec4c3fae781bb0c5075 Mon Sep 17 00:00:00 2001 -From: Ioana Ciornei <ioana.ciornei@nxp.com> -Date: Mon, 11 Nov 2019 18:50:56 +0200 -Subject: [PATCH] staging: dpaa2-ethsw: move port switchdev notifier per ethsw - -Register a different switchdev notifier block per ethsw instance. -When probing multiple dpaa2-ethsw instances, without this the register -will fail. - -Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com> -Link: https://lore.kernel.org/r/1573491058-24766-3-git-send-email-ioana.ciornei@nxp.com -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ---- - drivers/staging/fsl-dpaa2/ethsw/ethsw.c | 11 ++++------- - drivers/staging/fsl-dpaa2/ethsw/ethsw.h | 1 + - 2 files changed, 5 insertions(+), 7 deletions(-) - ---- a/drivers/staging/fsl-dpaa2/ethsw/ethsw.c -+++ b/drivers/staging/fsl-dpaa2/ethsw/ethsw.c -@@ -1314,10 +1314,6 @@ static int port_switchdev_blocking_event - return NOTIFY_DONE; - } - --static struct notifier_block port_switchdev_nb = { -- .notifier_call = port_switchdev_event, --}; -- - static struct notifier_block port_switchdev_blocking_nb = { - .notifier_call = port_switchdev_blocking_event, - }; -@@ -1334,7 +1330,8 @@ static int ethsw_register_notifier(struc - return err; - } - -- err = register_switchdev_notifier(&port_switchdev_nb); -+ ethsw->port_switchdev_nb.notifier_call = port_switchdev_event; -+ err = register_switchdev_notifier(ðsw->port_switchdev_nb); - if (err) { - dev_err(dev, "Failed to register switchdev notifier\n"); - goto err_switchdev_nb; -@@ -1349,7 +1346,7 @@ static int ethsw_register_notifier(struc - return 0; - - err_switchdev_blocking_nb: -- unregister_switchdev_notifier(&port_switchdev_nb); -+ unregister_switchdev_notifier(ðsw->port_switchdev_nb); - err_switchdev_nb: - unregister_netdevice_notifier(ðsw->port_nb); - return err; -@@ -1499,7 +1496,7 @@ static void ethsw_unregister_notifier(st - dev_err(dev, - "Failed to unregister switchdev blocking notifier (%d)\n", err); - -- err = unregister_switchdev_notifier(&port_switchdev_nb); -+ err = unregister_switchdev_notifier(ðsw->port_switchdev_nb); - if (err) - dev_err(dev, - "Failed to unregister switchdev notifier (%d)\n", err); ---- a/drivers/staging/fsl-dpaa2/ethsw/ethsw.h -+++ b/drivers/staging/fsl-dpaa2/ethsw/ethsw.h -@@ -68,6 +68,7 @@ struct ethsw_core { - bool learning; - - struct notifier_block port_nb; -+ struct notifier_block port_switchdev_nb; - }; - - #endif /* __ETHSW_H */ |