Re: [patch net-next 3/9] net_sch: cbs: Change TC_SETUP_CBS to TC_SETUP_QDISC_CBS

[Vinicius Costa Gomes]

Hi,

Jiri Pirko  writes:

> From: Nogah Frankel 
>
> Change TC_SETUP_CBS to TC_SETUP_QDISC_CBS to match the new convention..
>
> Signed-off-by: Nogah Frankel 
> Signed-off-by: Jiri Pirko 
> ---
>  drivers/net/ethernet/intel/igb/igb_main.c | 2 +-
>  include/linux/netdevice.h | 2 +-
>  net/sched/sch_cbs.c   | 4 ++--
>  3 files changed, 4 insertions(+), 4 deletions(-)
>

Acked-by: Vinicius Costa Gomes 


Cheers,
--
Vinicius

Re: [patch net-next 3/9] net_sch: cbs: Change TC_SETUP_CBS to TC_SETUP_QDISC_CBS

[Simon Horman]

On Mon, Nov 06, 2017 at 07:23:43AM +0100, Jiri Pirko wrote:
> From: Nogah Frankel 
> 
> Change TC_SETUP_CBS to TC_SETUP_QDISC_CBS to match the new convention..
> 
> Signed-off-by: Nogah Frankel 
> Signed-off-by: Jiri Pirko 

Reviewed-by: Simon Horman 

[patch net-next 3/9] net_sch: cbs: Change TC_SETUP_CBS to TC_SETUP_QDISC_CBS

[Jiri Pirko]

From: Nogah Frankel 

Change TC_SETUP_CBS to TC_SETUP_QDISC_CBS to match the new convention..

Signed-off-by: Nogah Frankel 
Signed-off-by: Jiri Pirko 
---
 drivers/net/ethernet/intel/igb/igb_main.c | 2 +-
 include/linux/netdevice.h | 2 +-
 net/sched/sch_cbs.c   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/intel/igb/igb_main.c 
b/drivers/net/ethernet/intel/igb/igb_main.c
index e22bce7..43cf395 100644
--- 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 703885a..30f0f29 100644
--- 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 bdb533b..7a72980 100644
--- 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, );
+   err = ops->ndo_setup_tc(dev, TC_SETUP_QDISC_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, );
+   err = ops->ndo_setup_tc(dev, TC_SETUP_QDISC_CBS, );
if (err < 0)
return err;
 
-- 
2.9.5