net: dsa: Do not make user port errors fatal
Subsystems (3)
PATCH 1/1 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).
--- net/dsa/dsa2.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)
net/dsa/dsa2.c +1 -7
@@ -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];
Signature · 1 line
2.17.1
David Miller
maintainerFrom: Florian Fainelli <[email protected]>
Date: Wed, 13 May 2020 10:41:45 -0700
Quoted 8 lines
commit
86f8b1c01a0a537a73d2996615133be63cdf75dbupstreamPrior 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).
Quoted 4 lines
Fixes 1d27732f411d ("net: dsa: setup and teardown ports")Signed-off-by Florian Fainelli <[email protected]>Reviewed-by Andrew Lunn <[email protected]>Signed-off-by David S. Miller <[email protected]>
Greg, please queue this up.
Greg KH
maintainerQuoted 11 lines · David Miller
From: Florian Fainelli <[email protected]>
Date: Wed, 13 May 2020 10:41:45 -0700Quoted 8 lines
commit
86f8b1c01a0a537a73d2996615133be63cdf75dbupstreamPrior 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).
Quoted 6 lines
Quoted 4 lines
Fixes 1d27732f411d ("net: dsa: setup and teardown ports")Signed-off-by Florian Fainelli <[email protected]>Reviewed-by Andrew Lunn <[email protected]>Signed-off-by David S. Miller <[email protected]>Greg, please queue this up.
Now queued up, thanks.
greg k-h