summaryrefslogtreecommitdiffstats
path: root/net/dsa
diff options
context:
space:
mode:
authorFlorian Fainelli <f.fainelli@gmail.com>2020-05-03 20:50:57 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-05-20 08:18:32 +0200
commit8ab7974fd8212c8cbcb3bca5564730773eadfd24 (patch)
tree54ee4da5d5e8460a6ca72b06b23fcfc3533a85d8 /net/dsa
parent258f0cf7ac3b788a14c0d01aab3c4aea02f8c86e (diff)
downloadlinux-stable-8ab7974fd8212c8cbcb3bca5564730773eadfd24.tar.gz
linux-stable-8ab7974fd8212c8cbcb3bca5564730773eadfd24.tar.bz2
linux-stable-8ab7974fd8212c8cbcb3bca5564730773eadfd24.zip
net: dsa: Do not make user port errors fatal
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>
Diffstat (limited to 'net/dsa')
-rw-r--r--net/dsa/dsa2.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c
index 46ae4dee522a..b036c55f5cb1 100644
--- a/net/dsa/dsa2.c
+++ b/net/dsa/dsa2.c
@@ -412,7 +412,7 @@ static int dsa_tree_setup_switches(struct dsa_switch_tree *dst)
err = dsa_switch_setup(ds);
if (err)
- return err;
+ continue;
for (port = 0; port < ds->num_ports; port++) {
dp = &ds->ports[port];