GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-07-07 15:01:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

net: dsa: remove the dst->ds array

Browse source 
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>
This commit is contained in:
Vivien Didelot 2019-10-30 22:09:16 -04:00 • committed by David S. Miller
parent 3774ecdb8c
commit 9c8ad1ab66
2 changed files with 0 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

5
include/net/dsa.h
View file

@ -125,11 +125,6 @@ struct dsa_switch_tree {
/* List of DSA links composing the routing table */ /* List of DSA links composing the routing table */
struct list_head rtable; 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 */ /* TC matchall action types, only mirroring for now */

7
net/dsa/dsa2.c
View file

@ -578,25 +578,18 @@ static void dsa_tree_remove_switch(struct dsa_switch_tree *dst,
{ {
dsa_tree_teardown(dst); dsa_tree_teardown(dst);
dst->ds[index] = NULL;
dsa_tree_put(dst); dsa_tree_put(dst);
} }
static int dsa_tree_add_switch(struct dsa_switch_tree *dst, static int dsa_tree_add_switch(struct dsa_switch_tree *dst,
struct dsa_switch *ds) struct dsa_switch *ds)
{ {
unsigned int index = ds->index;
int err; int err;
if (dst->ds[index])
return -EBUSY;
dsa_tree_get(dst); dsa_tree_get(dst);
dst->ds[index] = ds;
err = dsa_tree_setup(dst); err = dsa_tree_setup(dst);
if (err) { if (err) {
dst->ds[index] = NULL;
dsa_tree_put(dst); dsa_tree_put(dst);
} }