瀏覽代碼

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>
Jiri Pirko 8 年之前
父節點
當前提交
ade9b65884
共有 4 個文件被更改,包括 5 次插入5 次删除
  1. 1 1
      drivers/net/ethernet/mellanox/mlxsw/spectrum.c
  2. 1 1
      include/linux/netdevice.h
  3. 1 1
      net/dsa/slave.c
  4. 2 2
      net/sched/cls_matchall.c

+ 1 - 1
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;
 		return -EOPNOTSUPP;
 
 
 	switch (type) {
 	switch (type) {
-	case TC_SETUP_MATCHALL:
+	case TC_SETUP_CLSMATCHALL:
 		switch (tc->cls_mall->command) {
 		switch (tc->cls_mall->command) {
 		case TC_CLSMATCHALL_REPLACE:
 		case TC_CLSMATCHALL_REPLACE:
 			return mlxsw_sp_port_add_cls_matchall(mlxsw_sp_port,
 			return mlxsw_sp_port_add_cls_matchall(mlxsw_sp_port,

+ 1 - 1
include/linux/netdevice.h

@@ -778,7 +778,7 @@ enum tc_setup_type {
 	TC_SETUP_MQPRIO,
 	TC_SETUP_MQPRIO,
 	TC_SETUP_CLSU32,
 	TC_SETUP_CLSU32,
 	TC_SETUP_CLSFLOWER,
 	TC_SETUP_CLSFLOWER,
-	TC_SETUP_MATCHALL,
+	TC_SETUP_CLSMATCHALL,
 	TC_SETUP_CLSBPF,
 	TC_SETUP_CLSBPF,
 };
 };
 
 

+ 1 - 1
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;
 		return -EOPNOTSUPP;
 
 
 	switch (type) {
 	switch (type) {
-	case TC_SETUP_MATCHALL:
+	case TC_SETUP_CLSMATCHALL:
 		switch (tc->cls_mall->command) {
 		switch (tc->cls_mall->command) {
 		case TC_CLSMATCHALL_REPLACE:
 		case TC_CLSMATCHALL_REPLACE:
 			return dsa_slave_add_cls_matchall(dev, protocol,
 			return dsa_slave_add_cls_matchall(dev, protocol,

+ 2 - 2
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->exts = &head->exts;
 	offload.cls_mall->cookie = cookie;
 	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->q->handle, tp->chain->index,
 					    tp->protocol, &offload);
 					    tp->protocol, &offload);
 	if (!err)
 	if (!err)
@@ -85,7 +85,7 @@ static void mall_destroy_hw_filter(struct tcf_proto *tp,
 	offload.cls_mall->exts = NULL;
 	offload.cls_mall->exts = NULL;
 	offload.cls_mall->cookie = cookie;
 	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);
 				      tp->chain->index, tp->protocol, &offload);
 }
 }