From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 14 May 2020 09:47:19 +0000 (+0200)
Subject: 4.19-stable patches
X-Git-Tag: v4.4.224~73
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=de59764159903952f56fbd8e8673b0de9cf1b5dc;p=thirdparty%2Fkernel%2Fstable-queue.git

4.19-stable patches

added patches:
	net-dsa-do-not-make-user-port-errors-fatal.patch
---

diff --git a/queue-4.19/net-dsa-do-not-make-user-port-errors-fatal.patch b/queue-4.19/net-dsa-do-not-make-user-port-errors-fatal.patch
new file mode 100644
index 00000000000..be10930102a
--- /dev/null
+++ b/queue-4.19/net-dsa-do-not-make-user-port-errors-fatal.patch
@@ -0,0 +1,36 @@
+From 86f8b1c01a0a537a73d2996615133be63cdf75db Mon Sep 17 00:00:00 2001
+From: Florian Fainelli <f.fainelli@gmail.com>
+Date: Sun, 3 May 2020 20:50:57 -0700
+Subject: net: dsa: Do not make user port errors fatal
+
+From: Florian Fainelli <f.fainelli@gmail.com>
+
+commit 86f8b1c01a0a537a73d2996615133be63cdf75db upstream.
+
+Prior to 1d27732f411d ("net: dsa: setup and teardown ports"), we would
+not treat failures to set-up an user port as fatal, but after this
+commit we would, which is a regression for some systems where interfaces
+may be declared in the Device Tree, but the underlying hardware may not
+be present (pluggable daughter cards for instance).
+
+Fixes: 1d27732f411d ("net: dsa: setup and teardown ports")
+Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
+Reviewed-by: Andrew Lunn <andrew@lunn.ch>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ net/dsa/dsa2.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/net/dsa/dsa2.c
++++ b/net/dsa/dsa2.c
+@@ -412,7 +412,7 @@ static int dsa_tree_setup_switches(struc
+ 
+ 		err = dsa_switch_setup(ds);
+ 		if (err)
+-			return err;
++			continue;
+ 
+ 		for (port = 0; port < ds->num_ports; port++) {
+ 			dp = &ds->ports[port];
diff --git a/queue-4.19/series b/queue-4.19/series
new file mode 100644
index 00000000000..131a7a00efb
--- /dev/null
+++ b/queue-4.19/series
@@ -0,0 +1 @@
+net-dsa-do-not-make-user-port-errors-fatal.patch
diff --git a/queue-5.4/series b/queue-5.4/series
new file mode 100644
index 00000000000..131a7a00efb
--- /dev/null
+++ b/queue-5.4/series
@@ -0,0 +1 @@
+net-dsa-do-not-make-user-port-errors-fatal.patch