net: dsa: let switches specify their tagging protocol

In order to support the new DSA device driver model, a dsa_switch should
be able to advertise the type of tagging protocol supported by the
underlying switch device. This also removes constraints on how tagging
can be stacked to each other.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/dsa.h b/include/net/dsa.h
index c542c131d5512ae233a98a43468e56a66b5609db..b525ac5165599427204e839fe0a63a127c5a7ed7 100644 (file)
--- a/include/net/dsa.h
+++ b/include/net/dsa.h
@@ -127,6 +127,11 @@ struct dsa_switch {
        struct dsa_switch_tree  *dst;
        int                     index;
 
+       /*
+        * Tagging protocol understood by this switch
+        */
+       enum dsa_tag_protocol   tag_protocol;
+
        /*
         * Configuration data for this switch.
         */

diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
index 6f02ccc57593fe76adb12b985fcfdb6f7423e0c4..4cc995664fdf679c22b2df051d1da50d5fb7cf20 100644 (file)
--- a/net/dsa/dsa.c
+++ b/net/dsa/dsa.c
@@ -227,7 +227,7 @@ static int dsa_switch_setup_one(struct dsa_switch *ds, struct device *parent)
         * switch.
         */
        if (dst->cpu_switch == index) {
-               switch (drv->tag_protocol) {
+               switch (ds->tag_protocol) {
 #ifdef CONFIG_NET_DSA_TAG_DSA
                case DSA_TAG_PROTO_DSA:
                        dst->rcv = dsa_netdev_ops.rcv;
@@ -255,7 +255,7 @@ static int dsa_switch_setup_one(struct dsa_switch *ds, struct device *parent)
                        goto out;
                }
 
-               dst->tag_protocol = drv->tag_protocol;
+               dst->tag_protocol = ds->tag_protocol;
        }
 
        /*
@@ -364,6 +364,7 @@ dsa_switch_setup(struct dsa_switch_tree *dst, int index,
        ds->index = index;
        ds->pd = pd;
        ds->drv = drv;
+       ds->tag_protocol = drv->tag_protocol;
        ds->master_dev = host_dev;
 
        ret = dsa_switch_setup_one(ds, parent);