[PATCH net-next 07/11] net: dsa: get tree before parsing ports

[Vivien Didelot]

We will need a reference to the dsa_switch_tree when parsing a CPU port,
so fetch it right after parsing the member and before parsing ports.

Signed-off-by: Vivien Didelot 
---
 net/dsa/dsa2.c | 18 ++
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c
index 5b6a3dad8015..5918fbddb0ab 100644
--- a/net/dsa/dsa2.c
+++ b/net/dsa/dsa2.c
@@ -751,18 +751,10 @@ static int _dsa_register_switch(struct dsa_switch *ds)
err = dsa_parse_member_dn(np, , );
if (err)
return err;
-
-   err = dsa_parse_ports_of(np, ds);
-   if (err)
-   return err;
} else {
err = dsa_parse_member(pdata, , );
if (err)
return err;
-
-   err = dsa_parse_ports(pdata, ds);
-   if (err)
-   return err;
}
 
dst = dsa_tree_touch(tree);
@@ -773,6 +765,16 @@ static int _dsa_register_switch(struct dsa_switch *ds)
ds->index = index;
ds->cd = pdata;
 
+   if (np) {
+   err = dsa_parse_ports_of(np, ds);
+   if (err)
+   return err;
+   } else {
+   err = dsa_parse_ports(pdata, ds);
+   if (err)
+   return err;
+   }
+
/* Initialize the routing table */
for (i = 0; i < DSA_MAX_SWITCHES; ++i)
ds->rtable[i] = DSA_RTABLE_NONE;
-- 
2.14.3

[PATCH net-next 07/11] net: dsa: get tree before parsing ports

[Vivien Didelot]

We will need a reference to the dsa_switch_tree when parsing a CPU port,
so fetch it right after parsing the member and before parsing ports.

Signed-off-by: Vivien Didelot 
---
 net/dsa/dsa2.c | 18 ++
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c
index 5b6a3dad8015..5918fbddb0ab 100644
--- a/net/dsa/dsa2.c
+++ b/net/dsa/dsa2.c
@@ -751,18 +751,10 @@ static int _dsa_register_switch(struct dsa_switch *ds)
err = dsa_parse_member_dn(np, , );
if (err)
return err;
-
-   err = dsa_parse_ports_of(np, ds);
-   if (err)
-   return err;
} else {
err = dsa_parse_member(pdata, , );
if (err)
return err;
-
-   err = dsa_parse_ports(pdata, ds);
-   if (err)
-   return err;
}
 
dst = dsa_tree_touch(tree);
@@ -773,6 +765,16 @@ static int _dsa_register_switch(struct dsa_switch *ds)
ds->index = index;
ds->cd = pdata;
 
+   if (np) {
+   err = dsa_parse_ports_of(np, ds);
+   if (err)
+   return err;
+   } else {
+   err = dsa_parse_ports(pdata, ds);
+   if (err)
+   return err;
+   }
+
/* Initialize the routing table */
for (i = 0; i < DSA_MAX_SWITCHES; ++i)
ds->rtable[i] = DSA_RTABLE_NONE;
-- 
2.14.3