net: dsa: Copy the routing table into the switch structure

The new binding will not have a chip data structure, it will place the
routing directly into the switch structure. To enable backwards
compatibility, copy the routing from the chip data into the switch
structure.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Reviewed-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/dsa/mv88e6xxx.c b/drivers/net/dsa/mv88e6xxx.c
index d622c0fb76cce51dc9402de23f06cb077239f478..492801a6398c3b3f659a65238347a95a45b06bf2 100644 (file)
--- a/drivers/net/dsa/mv88e6xxx.c
+++ b/drivers/net/dsa/mv88e6xxx.c
@@ -3024,8 +3024,8 @@ static int mv88e6xxx_setup_global(struct mv88e6xxx_priv_state *ps)
        for (i = 0; i < 32; i++) {
                int nexthop = 0x1f;
 
-               if (i != ps->ds->index && i < ps->ds->dst->pd->nr_chips)
-                       nexthop = ps->ds->cd->rtable[i] & 0x1f;
+               if (i != ds->index && i < DSA_MAX_SWITCHES)
+                       nexthop = ds->rtable[i] & 0x1f;
 
                err = _mv88e6xxx_reg_write(
                        ps, REG_GLOBAL2,

diff --git a/include/net/dsa.h b/include/net/dsa.h
index 4e3afa9648ca37a954674d51e916fb4777c8e97a..b666f27b3daa38bb1ad864cb49ae0f524472d229 100644 (file)
--- a/include/net/dsa.h
+++ b/include/net/dsa.h
@@ -148,6 +148,13 @@ struct dsa_switch {
         */
        struct dsa_switch_driver        *drv;
 
+       /*
+        * An array of which element [a] indicates which port on this
+        * switch should be used to send packets to that are destined
+        * for switch a. Can be NULL if there is only one switch chip.
+        */
+       s8              rtable[DSA_MAX_SWITCHES];
+
 #ifdef CONFIG_NET_DSA_HWMON
        /*
         * Hardware monitoring information
@@ -194,7 +201,7 @@ static inline u8 dsa_upstream_port(struct dsa_switch *ds)
        if (dst->cpu_switch == ds->index)
                return dst->cpu_port;
        else
-               return ds->cd->rtable[dst->cpu_switch];
+               return ds->rtable[dst->cpu_switch];
 }
 
 struct switchdev_trans;

diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
index 6177dd7508477f5a8268b2ff85f1526950c1382a..bfe1d03d4730546e8c96bc196acfb9164397e05c 100644 (file)
--- a/net/dsa/dsa.c
+++ b/net/dsa/dsa.c
@@ -297,6 +297,8 @@ static int dsa_switch_setup_one(struct dsa_switch *ds, struct device *parent)
                dst->tag_protocol = drv->tag_protocol;
        }
 
+       memcpy(ds->rtable, cd->rtable, sizeof(ds->rtable));
+
        /*
         * Do basic register setup.
         */