lkml.org 
[lkml]   [2019]   [Oct]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH net-next 4/7] net: dsa: remove the dst->ds array
Date
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>
---
include/net/dsa.h | 5 -----
net/dsa/dsa2.c | 7 -------
2 files changed, 12 deletions(-)

diff --git a/include/net/dsa.h b/include/net/dsa.h
index 2c9eb18e34e7..470e7b638c12 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 54df0845dda7..8cddc1b3304f 100644
--- a/net/dsa/dsa2.c
+++ b/net/dsa/dsa2.c
@@ -571,25 +571,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);
}

--
2.23.0
\
 
 \ /
  Last update: 2019-10-28 20:53    [W:0.073 / U:0.628 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site