net: dsa: Do not make user port errors fatal
commit5.4-rM2-2.2.x-imx-squashed86f8b1c01a
upstream. Prior to1d27732f41
("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:1d27732f41
("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>
parent
cbaf236995
commit
723090ae8e
|
@ -461,18 +461,12 @@ static int dsa_tree_setup_switches(struct dsa_switch_tree *dst)
|
||||||
|
|
||||||
err = dsa_port_setup(dp);
|
err = dsa_port_setup(dp);
|
||||||
if (err)
|
if (err)
|
||||||
goto ports_teardown;
|
continue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
ports_teardown:
|
|
||||||
for (i = 0; i < port; i++)
|
|
||||||
dsa_port_teardown(&ds->ports[i]);
|
|
||||||
|
|
||||||
dsa_switch_teardown(ds);
|
|
||||||
|
|
||||||
switch_teardown:
|
switch_teardown:
|
||||||
for (i = 0; i < device; i++) {
|
for (i = 0; i < device; i++) {
|
||||||
ds = dst->ds[i];
|
ds = dst->ds[i];
|
||||||
|
|
Loading…
Reference in New Issue