net_sch: cbs: Change TC_SETUP_CBS to TC_SETUP_QDISC_CBS

Change TC_SETUP_CBS to TC_SETUP_QDISC_CBS to match the new convention..

Signed-off-by: Nogah Frankel <nogahf@mellanox.com>
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Reviewed-by: Simon Horman <simon.horman@netronome.com>
Acked-by: Vinicius Costa Gomes <vinicius.gomes@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index e22bce7cdacdc13715c3d092faa6a057dd0dc62f..43cf39527660b6c6e07f200131c60066b83df932 100644 (file)
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -2488,7 +2488,7 @@ static int igb_setup_tc(struct net_device *dev, enum tc_setup_type type,
        struct igb_adapter *adapter = netdev_priv(dev);
 
        switch (type) {
-       case TC_SETUP_CBS:
+       case TC_SETUP_QDISC_CBS:
                return igb_offload_cbs(adapter, type_data);
 
        default:

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 703885aed856dab7c5b7065d0f3d90ae0e7c18c6..30f0f29288088886616f34e860dbefb95e4ca147 100644 (file)
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -776,7 +776,7 @@ enum tc_setup_type {
        TC_SETUP_CLSMATCHALL,
        TC_SETUP_CLSBPF,
        TC_SETUP_BLOCK,
-       TC_SETUP_CBS,
+       TC_SETUP_QDISC_CBS,
        TC_SETUP_QDISC_RED,
 };
 

diff --git a/net/sched/sch_cbs.c b/net/sched/sch_cbs.c
index bdb533b7fb8cecf553fc7c9736c5d1fdf851ebb1..7a72980c15092ca10a781e5c4e4f9619d057fb63 100644 (file)
--- a/net/sched/sch_cbs.c
+++ b/net/sched/sch_cbs.c
@@ -212,7 +212,7 @@ static void cbs_disable_offload(struct net_device *dev,
        cbs.queue = q->queue;
        cbs.enable = 0;
 
-       err = ops->ndo_setup_tc(dev, TC_SETUP_CBS, &cbs);
+       err = ops->ndo_setup_tc(dev, TC_SETUP_QDISC_CBS, &cbs);
        if (err < 0)
                pr_warn("Couldn't disable CBS offload for queue %d\n",
                        cbs.queue);
@@ -236,7 +236,7 @@ static int cbs_enable_offload(struct net_device *dev, struct cbs_sched_data *q,
        cbs.idleslope = opt->idleslope;
        cbs.sendslope = opt->sendslope;
 
-       err = ops->ndo_setup_tc(dev, TC_SETUP_CBS, &cbs);
+       err = ops->ndo_setup_tc(dev, TC_SETUP_QDISC_CBS, &cbs);
        if (err < 0)
                return err;