net: dsa: Pass ndo_setup_tc slave callback to drivers

DSA currently handles shared block filters (for the classifier-action
qdisc) in the core due to what I believe are simply pragmatic reasons -
hiding the complexity from drivers and offerring a simple API for port
mirroring.

Extend the dsa_slave_setup_tc function by passing all other qdisc
offloads to the driver layer, where the driver may choose what it
implements and how. DSA is simply a pass-through in this case.

Signed-off-by: Vladimir Oltean <olteanv@gmail.com>
Acked-by: Kurt Kanzenbach <kurt@linutronix.de>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Acked-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/dsa.h b/include/net/dsa.h
index 96acb14ec1a8eb17f30b2c8e1166ab5e2f06291a..541fb514e31dd1e811e2b360cf9e7ecfcd077463 100644 (file)
--- a/include/net/dsa.h
+++ b/include/net/dsa.h
@@ -515,6 +515,8 @@ struct dsa_switch_ops {
                                   bool ingress);
        void    (*port_mirror_del)(struct dsa_switch *ds, int port,
                                   struct dsa_mall_mirror_tc_entry *mirror);
+       int     (*port_setup_tc)(struct dsa_switch *ds, int port,
+                                enum tc_setup_type type, void *type_data);
 
        /*
         * Cross-chip operations

diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index 9a88035517a69d7be449ade96e265d9177f0ae8c..75d58229a4bd356a18375a4e0c9e22e9e9a64082 100644 (file)
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -1035,12 +1035,16 @@ static int dsa_slave_setup_tc_block(struct net_device *dev,
 static int dsa_slave_setup_tc(struct net_device *dev, enum tc_setup_type type,
                              void *type_data)
 {
-       switch (type) {
-       case TC_SETUP_BLOCK:
+       struct dsa_port *dp = dsa_slave_to_port(dev);
+       struct dsa_switch *ds = dp->ds;
+
+       if (type == TC_SETUP_BLOCK)
                return dsa_slave_setup_tc_block(dev, type_data);
-       default:
+
+       if (!ds->ops->port_setup_tc)
                return -EOPNOTSUPP;
-       }
+
+       return ds->ops->port_setup_tc(ds, dp->index, type, type_data);
 }
 
 static void dsa_slave_get_stats64(struct net_device *dev,