net: dsa: add ds and index to dsa_port

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>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/dsa.h b/include/net/dsa.h
index 24e1d935ae681171df38c5b0dfb0f14b513ba180..6bd1f8b05dbdbea32342bec767ca0775f1f42b4b 100644 (file)
--- 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 6e7b3e88b77846c2bb007a5c3da69c192e9237d5..9f8cc26be9eac1fc3c9017636d418ceed4814aea 100644 (file)
--- 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);