diff options
| author | Vivien Didelot <vivien.didelot@gmail.com> | 2019-10-30 22:09:16 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-10-31 14:26:38 -0700 |
| commit | 9c8ad1ab66b577526a4c89e4a222e0fac431a2d6 (patch) | |
| tree | 5d56e482bcdfdb0af3fbeb5735a554f41cd833c5 | |
| parent | 3774ecdb8ca201af770288d57997dbf6445eb3c8 (diff) | |
| download | linux-9c8ad1ab66b577526a4c89e4a222e0fac431a2d6.tar.gz linux-9c8ad1ab66b577526a4c89e4a222e0fac431a2d6.tar.bz2 linux-9c8ad1ab66b577526a4c89e4a222e0fac431a2d6.zip | |
net: dsa: remove the dst->ds array
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>
| -rw-r--r-- | include/net/dsa.h | 5 | ||||
| -rw-r--r-- | net/dsa/dsa2.c | 7 |
2 files changed, 0 insertions, 12 deletions
diff --git a/include/net/dsa.h b/include/net/dsa.h index b46222adb5c2..e4c697b95c70 100644 --- a/include/net/dsa.h +++ b/include/net/dsa.h @@ -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 */ diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c index a887231fff13..92e71b12b729 100644 --- a/net/dsa/dsa2.c +++ b/net/dsa/dsa2.c @@ -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); } |