diff options
author | Florian Fainelli <f.fainelli@gmail.com> | 2020-05-03 20:50:57 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-05-20 08:20:03 +0200 |
commit | 723090ae8ea6428fddc9a380771d7002741815fc (patch) | |
tree | 74839e64670cf9f4dda33ac81e68f230dc3955e6 /net | |
parent | cbaf2369956178e68fb714a30dc86cf768dd596a (diff) |
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')
-rw-r--r-- | net/dsa/dsa2.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c index 716d265ba8ca..0f7f38c29579 100644 --- a/net/dsa/dsa2.c +++ b/net/dsa/dsa2.c @@ -461,18 +461,12 @@ static int dsa_tree_setup_switches(struct dsa_switch_tree *dst) err = dsa_port_setup(dp); if (err) - goto ports_teardown; + continue; } } return 0; -ports_teardown: - for (i = 0; i < port; i++) - dsa_port_teardown(&ds->ports[i]); - - dsa_switch_teardown(ds); - switch_teardown: for (i = 0; i < device; i++) { ds = dst->ds[i]; |