Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0eefe2c1 authored by Vivien Didelot's avatar Vivien Didelot Committed by David S. Miller
Browse files

net: dsa: get tree before parsing ports 



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: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6da2a940

net/dsa/dsa2.c

+10 −8
Original line number Diff line number Diff line
@@ -751,18 +751,10 @@ static int _dsa_register_switch(struct dsa_switch *ds) 
		err = dsa_parse_member_dn(np, &tree, &index);

		if (err)

			return err;



		err = dsa_parse_ports_of(np, ds);

		if (err)

			return err;

	} else {

		err = dsa_parse_member(pdata, &tree, &index);

		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;