commit e04449fcf2cd63dec176355a028bd28b4d469be9
author Tobias Waldekranz <tobias@waldekranz.com> Thu Feb 05 14:54:09 2015 +0100
committer David S. Miller <davem@davemloft.net> Sat Feb 07 22:07:37 2015 -0800
tree 09092393163b21a8f41f5dda29d7b9a9e082515f
parent 6e0ba47f9191511a91556b7ca2c491362680a0f3

dsa: correctly determine the number of switches in a system

The number of connected switches was sourced from the number of
children to the DSA node, change it to the number of available
children, skipping any disabled switches.

Fixes: 5e95329b701c4 ("dsa: add device tree bindings to register DSA switches")
Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

net/dsa/dsa.c

diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
index 3731714..2173402 100644
--- a/net/dsa/dsa.c
+++ b/net/dsa/dsa.c
@@ -603,7 +603,7 @@
 
 	pdev->dev.platform_data = pd;
 	pd->netdev = &ethernet_dev->dev;
-	pd->nr_chips = of_get_child_count(np);
+	pd->nr_chips = of_get_available_child_count(np);
 	if (pd->nr_chips > DSA_MAX_SWITCHES)
 		pd->nr_chips = DSA_MAX_SWITCHES;