net: dsa: remove tag_protocol from dsa_switch

Having the tag protocol in dsa_switch_driver for setup time and in
dsa_switch_tree for runtime is enough. Remove dsa_switch's one.

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 c4bc42bd3538c7add51861bdddf30f16663b31f9..2d280aba97e25c0043fc6af1023e975cf4a7f077 100644 (file)
--- a/include/net/dsa.h
+++ b/include/net/dsa.h
@@ -135,11 +135,6 @@ struct dsa_switch {
         */
        void *priv;
 
-       /*
-        * 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 efa612f0ab9b16f140f4dbdefc5f3d0f74b2efba..d61ceed912be0c6490f3826e3e9816097281136c 100644 (file)
--- a/net/dsa/dsa.c
+++ b/net/dsa/dsa.c
@@ -267,7 +267,7 @@ static int dsa_switch_setup_one(struct dsa_switch *ds, struct device *parent)
         * switch.
         */
        if (dst->cpu_switch == index) {
-               switch (ds->tag_protocol) {
+               switch (drv->tag_protocol) {
 #ifdef CONFIG_NET_DSA_TAG_DSA
                case DSA_TAG_PROTO_DSA:
                        dst->rcv = dsa_netdev_ops.rcv;
@@ -295,7 +295,7 @@ static int dsa_switch_setup_one(struct dsa_switch *ds, struct device *parent)
                        goto out;
                }
 
-               dst->tag_protocol = ds->tag_protocol;
+               dst->tag_protocol = drv->tag_protocol;
        }
 
        /*
@@ -411,7 +411,6 @@ dsa_switch_setup(struct dsa_switch_tree *dst, int index,
        ds->pd = pd;
        ds->drv = drv;
        ds->priv = priv;
-       ds->tag_protocol = drv->tag_protocol;
        ds->master_dev = host_dev;
 
        ret = dsa_switch_setup_one(ds, parent);