net: dsa: Allow the DSA driver to indicate the tag protocol

DSA drivers may drive different families of switches which need
different tag protocol. Rather than hard code the tag protocol in the
driver structure, have a callback for the DSA core to call.

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

2 files changed, 7 insertions, 2 deletions

diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
index 8bda74e595a5..8d3a28d4e99d 100644
--- a/net/dsa/dsa.c
+++ b/net/dsa/dsa.c
@@ -354,7 +354,10 @@ static int dsa_switch_setup_one(struct dsa_switch *ds, struct device *parent)
          * switch.
          */
         if (dst->cpu_switch == index) {
-                dst->tag_ops = dsa_resolve_tag_protocol(drv->tag_protocol);
+                enum dsa_tag_protocol tag_protocol;
+
+                tag_protocol = drv->get_tag_protocol(ds);
+                dst->tag_ops = dsa_resolve_tag_protocol(tag_protocol);
                 if (IS_ERR(dst->tag_ops)) {
                         ret = PTR_ERR(dst->tag_ops);
                         goto out;
diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c
index f30bad9678f0..2e343221464c 100644
--- a/net/dsa/dsa2.c
+++ b/net/dsa/dsa2.c
@@ -443,6 +443,7 @@ static int dsa_cpu_parse(struct device_node *port, u32 index,
                          struct dsa_switch_tree *dst,
                          struct dsa_switch *ds)
 {
+        enum dsa_tag_protocol tag_protocol;
         struct net_device *ethernet_dev;
         struct device_node *ethernet;
 
@@ -465,7 +466,8 @@ static int dsa_cpu_parse(struct device_node *port, u32 index,
                 dst->cpu_port = index;
         }
 
-        dst->tag_ops = dsa_resolve_tag_protocol(ds->drv->tag_protocol);
+        tag_protocol = ds->drv->get_tag_protocol(ds);
+        dst->tag_ops = dsa_resolve_tag_protocol(tag_protocol);
         if (IS_ERR(dst->tag_ops)) {
                 dev_warn(ds->dev, "No tagger for this switch\n");
                 return PTR_ERR(dst->tag_ops);