net: dsa: remove the dst->ds array (9c8ad1ab) · Commits · 戴 / test

Now that the DSA ports are listed in the switch fabric, there is no need to store the dsa_switch structures from the drivers in the fabric anymore. So get rid of the dst->ds static array. Signed-off-by:

Vivien Didelot <vivien.didelot@gmail.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

include/net/dsa.h

+0 −5

Original line number	Diff line number	Diff line
		@@ -125,11 +125,6 @@ struct dsa_switch_tree {

		/* List of DSA links composing the routing table */
		struct list_head rtable;

		/*
		* Data for the individual switch chips.
		*/
		struct dsa_switch *ds[DSA_MAX_SWITCHES];
		};

		/* TC matchall action types, only mirroring for now */

net/dsa/dsa2.c

+0 −7

Original line number	Diff line number	Diff line
		@@ -578,25 +578,18 @@ static void dsa_tree_remove_switch(struct dsa_switch_tree *dst,
		{
		dsa_tree_teardown(dst);

		dst->ds[index] = NULL;
		dsa_tree_put(dst);
		}

		static int dsa_tree_add_switch(struct dsa_switch_tree *dst,
		struct dsa_switch *ds)
		{
		unsigned int index = ds->index;
		int err;

		if (dst->ds[index])
		return -EBUSY;

		dsa_tree_get(dst);
		dst->ds[index] = ds;

		err = dsa_tree_setup(dst);
		if (err) {
		dst->ds[index] = NULL;
		dsa_tree_put(dst);
		}

Admin message