net: sched: rename TC_SETUP_MATCHALL to TC_SETUP_CLSMATCHALL

In order to be aligned with the rest of the types, rename
TC_SETUP_MATCHALL to TC_SETUP_CLSMATCHALL.

Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
index 155424266cbf90f227c9b15019764a3313a0cf65..6438c38e7a6856c3117434092b486d334f1779fd 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
@@ -1704,7 +1704,7 @@ static int mlxsw_sp_setup_tc(struct net_device *dev, enum tc_setup_type type,
                return -EOPNOTSUPP;
 
        switch (type) {
-       case TC_SETUP_MATCHALL:
+       case TC_SETUP_CLSMATCHALL:
                switch (tc->cls_mall->command) {
                case TC_CLSMATCHALL_REPLACE:
                        return mlxsw_sp_port_add_cls_matchall(mlxsw_sp_port,

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index e4238e540544ecaa17c8276fa6ee2f45ce40384b..f8051a36f900b1d112c0d903c7f5c24db5936011 100644 (file)
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -778,7 +778,7 @@ enum tc_setup_type {
        TC_SETUP_MQPRIO,
        TC_SETUP_CLSU32,
        TC_SETUP_CLSFLOWER,
-       TC_SETUP_MATCHALL,
+       TC_SETUP_CLSMATCHALL,
        TC_SETUP_CLSBPF,
 };
 

diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index b4b63c20ec80a66f79c95af9c0a10c1dc3062963..453f6ddcd023017f00cee770ebe4db1161a81272 100644 (file)
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -873,7 +873,7 @@ static int dsa_slave_setup_tc(struct net_device *dev, enum tc_setup_type type,
                return -EOPNOTSUPP;
 
        switch (type) {
-       case TC_SETUP_MATCHALL:
+       case TC_SETUP_CLSMATCHALL:
                switch (tc->cls_mall->command) {
                case TC_CLSMATCHALL_REPLACE:
                        return dsa_slave_add_cls_matchall(dev, protocol,

diff --git a/net/sched/cls_matchall.c b/net/sched/cls_matchall.c
index 6ffe0b82ab83fb63d9c3cab04de378594ef0395c..a8853ada22f6b3d1bd314e3b153694033a7dadd7 100644 (file)
--- a/net/sched/cls_matchall.c
+++ b/net/sched/cls_matchall.c
@@ -63,7 +63,7 @@ static int mall_replace_hw_filter(struct tcf_proto *tp,
        offload.cls_mall->exts = &head->exts;
        offload.cls_mall->cookie = cookie;
 
-       err = dev->netdev_ops->ndo_setup_tc(dev, TC_SETUP_MATCHALL,
+       err = dev->netdev_ops->ndo_setup_tc(dev, TC_SETUP_CLSMATCHALL,
                                            tp->q->handle, tp->chain->index,
                                            tp->protocol, &offload);
        if (!err)
@@ -85,7 +85,7 @@ static void mall_destroy_hw_filter(struct tcf_proto *tp,
        offload.cls_mall->exts = NULL;
        offload.cls_mall->cookie = cookie;
 
-       dev->netdev_ops->ndo_setup_tc(dev, TC_SETUP_MATCHALL, tp->q->handle,
+       dev->netdev_ops->ndo_setup_tc(dev, TC_SETUP_CLSMATCHALL, tp->q->handle,
                                      tp->chain->index, tp->protocol, &offload);
 }