From: Jiri Pirko <jiri@mellanox.com>
Date: Mon, 7 Aug 2017 10:15:18 +0200
Subject: net: sched: rename TC_SETUP_MATCHALL to TC_SETUP_CLSMATCHALL
Patch-mainline: v4.14-rc1
Git-commit: ade9b6588420b335851951702ab975c975b0c1b2
References: bsc#1056787
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>
Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
---
drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 2 +-
include/linux/netdevice.h | 2 +-
net/dsa/slave.c | 2 +-
net/sched/cls_matchall.c | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
@@ -1476,7 +1476,7 @@ static int mlxsw_sp_setup_tc(struct net_
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,
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -777,7 +777,7 @@ enum tc_setup_type {
TC_SETUP_MQPRIO,
TC_SETUP_CLSU32,
TC_SETUP_CLSFLOWER,
- TC_SETUP_MATCHALL,
+ TC_SETUP_CLSMATCHALL,
TC_SETUP_CLSBPF,
};
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -1148,7 +1148,7 @@ static int dsa_slave_setup_tc(struct net
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,
--- a/net/sched/cls_matchall.c
+++ b/net/sched/cls_matchall.c
@@ -63,7 +63,7 @@ static int mall_replace_hw_filter(struct
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(struc
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);
}