3 files changed, 14 insertions, 1 deletions

diff --git a/include/net/dsa.h b/include/net/dsa.h
index 20b3087ad193..52ab18bc2b0d 100644
--- a/include/net/dsa.h
+++ b/include/net/dsa.h
@@ -32,6 +32,8 @@ enum dsa_tag_protocol {
 #define DSA_MAX_SWITCHES        4
 #define DSA_MAX_PORTS           12
 
+#define DSA_RTABLE_NONE         -1
+
 struct dsa_chip_data {
         /*
          * How to access the switch configuration registers.
diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
index 766d2a525ada..7e68bc6bc853 100644
--- a/net/dsa/dsa.c
+++ b/net/dsa/dsa.c
@@ -774,11 +774,17 @@ static int dsa_of_probe(struct device *dev)
 
         chip_index = -1;
         for_each_available_child_of_node(np, child) {
+                int i;
+
                 chip_index++;
                 cd = &pd->chip[chip_index];
 
                 cd->of_node = child;
 
+                /* Initialize the routing table */
+                for (i = 0; i < DSA_MAX_SWITCHES; ++i)
+                        cd->rtable[i] = DSA_RTABLE_NONE;
+
                 /* When assigning the host device, increment its refcount */
                 cd->host_dev = get_device(&mdio_bus->dev);
 
diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c
index 83b95fc4cede..78e4c0131c30 100644
--- a/net/dsa/dsa2.c
+++ b/net/dsa/dsa2.c
@@ -595,7 +595,7 @@ static int _dsa_register_switch(struct dsa_switch *ds, struct device_node *np)
         struct device_node *ports = dsa_get_ports(ds, np);
         struct dsa_switch_tree *dst;
         u32 tree, index;
-        int err;
+        int i, err;
 
         err = dsa_parse_member(np, &tree, &index);
         if (err)
@@ -622,6 +622,11 @@ static int _dsa_register_switch(struct dsa_switch *ds, struct device_node *np)
 
         ds->dst = dst;
         ds->index = index;
+
+        /* Initialize the routing table */
+        for (i = 0; i < DSA_MAX_SWITCHES; ++i)
+                ds->rtable[i] = DSA_RTABLE_NONE;
+
         dsa_dst_add_ds(dst, ds, index);
 
         err = dsa_dst_complete(dst);