From: Vivien Didelot <vivien.didelot@gmail.com>
To: "David S. Miller" <davem@davemloft.net>
Cc: linux-kernel@vger.kernel.org,
Vivien Didelot <vivien.didelot@gmail.com>,
Florian Fainelli <f.fainelli@gmail.com>,
Andrew Lunn <andrew@lunn.ch>,
netdev@vger.kernel.org
Subject: [PATCH net-next 4/7] net: dsa: remove the dst->ds array
Date: Mon, 28 Oct 2019 15:52:17 -0400 [thread overview]
Message-ID: <20191028195220.2371843-5-vivien.didelot@gmail.com> (raw)
In-Reply-To: <20191028195220.2371843-1-vivien.didelot@gmail.com>
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
next prev parent reply other threads:[~2019-10-28 19:52 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-28 19:52 [PATCH net-next 0/7] net: dsa: replace routing tables with a list Vivien Didelot
2019-10-28 19:52 ` [PATCH net-next 1/7] net: dsa: list DSA links in the fabric Vivien Didelot
2019-10-30 21:39 ` David Miller
2019-10-31 2:14 ` Vivien Didelot
2019-10-28 19:52 ` [PATCH net-next 2/7] net: dsa: remove ds->rtable Vivien Didelot
2019-10-28 19:52 ` [PATCH net-next 3/7] net: dsa: remove switch routing table setup code Vivien Didelot
2019-10-28 19:52 ` Vivien Didelot [this message]
2019-10-28 19:52 ` [PATCH net-next 5/7] net: dsa: remove tree functions related to switches Vivien Didelot
2019-10-28 19:52 ` [PATCH net-next 6/7] net: dsa: remove limitation of switch index value Vivien Didelot
2019-10-28 19:52 ` [PATCH net-next 7/7] net: dsa: tag_8021q: clarify index limitation Vivien Didelot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191028195220.2371843-5-vivien.didelot@gmail.com \
--to=vivien.didelot@gmail.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).