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

Commit 4a7704ff authored by Andrew Lunn's avatar Andrew Lunn Committed by David S. Miller
Browse files

net: dsa: Remove dynamic allocate of routing table 



With a maximum of four switches, the size of the routing table is the
same as the pointer to it. Removing it makes the code simpler.

Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Reviewed-by: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 189b0d93

drivers/net/dsa/mv88e6xxx.c

+1 −2
Original line number Diff line number Diff line
@@ -3024,8 +3024,7 @@ static int mv88e6xxx_setup_global(struct mv88e6xxx_priv_state *ps) 
	for (i = 0; i < 32; i++) {

		int nexthop = 0x1f;



		if (ps->ds->cd->rtable &&

		    i != ps->ds->index && i < ps->ds->dst->pd->nr_chips)

		if (i != ps->ds->index && i < ps->ds->dst->pd->nr_chips)

			nexthop = ps->ds->cd->rtable[i] & 0x1f;



		err = _mv88e6xxx_reg_write(

include/net/dsa.h

+4 −5
Original line number Diff line number Diff line
@@ -58,12 +58,11 @@ struct dsa_chip_data { 
	struct device_node *port_dn[DSA_MAX_PORTS];



	/*

	 * An array (with nr_chips elements) of which element [a]

	 * indicates which port on this switch should be used to

	 * send packets to that are destined for switch a.  Can be

	 * NULL if there is only one switch chip.

	 * An array of which element [a] indicates which port on this

	 * switch should be used to send packets to that are destined

	 * for switch a. Can be NULL if there is only one switch chip.

	 */

	s8		*rtable;

	s8		rtable[DSA_MAX_SWITCHES];

};



struct dsa_platform_data {

net/dsa/dsa.c

+0 −12
Original line number Diff line number Diff line
@@ -587,17 +587,6 @@ static int dsa_of_setup_routing_table(struct dsa_platform_data *pd, 
	if (link_sw_addr >= pd->nr_chips)

		return -EINVAL;



	/* First time routing table allocation */

	if (!cd->rtable) {

		cd->rtable = kmalloc_array(pd->nr_chips, sizeof(s8),

					   GFP_KERNEL);

		if (!cd->rtable)

			return -ENOMEM;



		/* default to no valid uplink/downlink */

		memset(cd->rtable, -1, pd->nr_chips * sizeof(s8));

	}



	cd->rtable[link_sw_addr] = port_index;



	return 0;
@@ -639,7 +628,6 @@ static void dsa_of_free_platform_data(struct dsa_platform_data *pd) 
			kfree(pd->chip[i].port_names[port_index]);

			port_index++;

		}

		kfree(pd->chip[i].rtable);



		/* Drop our reference to the MDIO bus device */

		if (pd->chip[i].host_dev)