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>

diff --git a/include/net/dsa.h b/include/net/dsa.h
index b46222adb5c208ebd3659b837fe4589c7560bbee..e4c697b95c70544da2596c6a94329af6af41ff07 100644 (file)
--- 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 a887231fff1316424c1624fc964fec2b075a069b..92e71b12b7294fcda6cd8c33a1f88cc7932c31b3 100644 (file)
--- 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);
        }