From: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
To: netdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, kernel@savoirfairelinux.com,
"David S. Miller" <davem@davemloft.net>,
Florian Fainelli <f.fainelli@gmail.com>,
Andrew Lunn <andrew@lunn.ch>, John Crispin <john@phrozen.org>,
Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Subject: [PATCH net-next 3/9] net: dsa: add ds and index to dsa_port
Date: Fri, 27 Jan 2017 15:29:38 -0500 [thread overview]
Message-ID: <20170127202944.28598-4-vivien.didelot@savoirfairelinux.com> (raw)
In-Reply-To: <20170127202944.28598-1-vivien.didelot@savoirfairelinux.com>
Add the physical switch instance and port index a DSA port belongs to to
the dsa_port structure.
That can be used later to retrieve information about a physical port
when configuring a switch fabric, or lighten up struct dsa_slave_priv.
Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
---
include/net/dsa.h | 2 ++
net/dsa/dsa2.c | 6 ++++++
2 files changed, 8 insertions(+)
diff --git a/include/net/dsa.h b/include/net/dsa.h
index 24e1d935ae68..6bd1f8b05dbd 100644
--- a/include/net/dsa.h
+++ b/include/net/dsa.h
@@ -140,6 +140,8 @@ struct dsa_switch_tree {
};
struct dsa_port {
+ struct dsa_switch *ds;
+ unsigned int index;
struct net_device *netdev;
struct device_node *dn;
unsigned int ageing_time;
diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c
index 6e7b3e88b778..9f8cc26be9ea 100644
--- a/net/dsa/dsa2.c
+++ b/net/dsa/dsa2.c
@@ -670,6 +670,7 @@ struct dsa_switch *dsa_switch_alloc(struct device *dev, size_t n)
{
size_t size = sizeof(struct dsa_switch) + n * sizeof(struct dsa_port);
struct dsa_switch *ds;
+ int i;
ds = devm_kzalloc(dev, size, GFP_KERNEL);
if (!ds)
@@ -678,6 +679,11 @@ struct dsa_switch *dsa_switch_alloc(struct device *dev, size_t n)
ds->dev = dev;
ds->num_ports = n;
+ for (i = 0; i < ds->num_ports; ++i) {
+ ds->ports[i].index = i;
+ ds->ports[i].ds = ds;
+ }
+
return ds;
}
EXPORT_SYMBOL_GPL(dsa_switch_alloc);
--
2.11.0
next prev parent reply other threads:[~2017-01-27 20:29 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-27 20:29 [PATCH net-next 0/9] net: dsa: preparatory patches for multi-chip Vivien Didelot
2017-01-27 20:29 ` [PATCH net-next 1/9] net: dsa: variable number of ports Vivien Didelot
2017-01-27 20:29 ` [PATCH net-next 2/9] net: dsa: use ds->num_ports when possible Vivien Didelot
2017-01-27 20:29 ` Vivien Didelot [this message]
2017-01-27 20:29 ` [PATCH net-next 4/9] net: dsa: store a dsa_port in dsa_slave_priv Vivien Didelot
2017-01-27 20:29 ` [PATCH net-next 5/9] net: dsa: move bridge device in dsa_port Vivien Didelot
2017-01-27 20:29 ` [PATCH net-next 6/9] net: dsa: pass bridge device when a port leaves Vivien Didelot
2017-01-27 20:29 ` [PATCH net-next 7/9] net: dsa: mv88e6xxx: use dsa_port's bridge pointer Vivien Didelot
2017-01-27 20:29 ` [PATCH net-next 8/9] net: dsa: qca8k: " Vivien Didelot
2017-01-27 20:29 ` [PATCH net-next 9/9] net: dsa: b53: " Vivien Didelot
2017-01-29 23:43 ` [PATCH net-next 0/9] net: dsa: preparatory patches for multi-chip David Miller
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=20170127202944.28598-4-vivien.didelot@savoirfairelinux.com \
--to=vivien.didelot@savoirfairelinux.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=john@phrozen.org \
--cc=kernel@savoirfairelinux.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