Skip to content

Commit 8521db4

Browse files
Nogah Frankeldavem330
authored andcommitted
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>
1 parent 575ed7d commit 8521db4

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

drivers/net/ethernet/intel/igb/igb_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2488,7 +2488,7 @@ static int igb_setup_tc(struct net_device *dev, enum tc_setup_type type,
24882488
struct igb_adapter *adapter = netdev_priv(dev);
24892489

24902490
switch (type) {
2491-
case TC_SETUP_CBS:
2491+
case TC_SETUP_QDISC_CBS:
24922492
return igb_offload_cbs(adapter, type_data);
24932493

24942494
default:

include/linux/netdevice.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -776,7 +776,7 @@ enum tc_setup_type {
776776
TC_SETUP_CLSMATCHALL,
777777
TC_SETUP_CLSBPF,
778778
TC_SETUP_BLOCK,
779-
TC_SETUP_CBS,
779+
TC_SETUP_QDISC_CBS,
780780
TC_SETUP_QDISC_RED,
781781
};
782782

net/sched/sch_cbs.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ static void cbs_disable_offload(struct net_device *dev,
212212
cbs.queue = q->queue;
213213
cbs.enable = 0;
214214

215-
err = ops->ndo_setup_tc(dev, TC_SETUP_CBS, &cbs);
215+
err = ops->ndo_setup_tc(dev, TC_SETUP_QDISC_CBS, &cbs);
216216
if (err < 0)
217217
pr_warn("Couldn't disable CBS offload for queue %d\n",
218218
cbs.queue);
@@ -236,7 +236,7 @@ static int cbs_enable_offload(struct net_device *dev, struct cbs_sched_data *q,
236236
cbs.idleslope = opt->idleslope;
237237
cbs.sendslope = opt->sendslope;
238238

239-
err = ops->ndo_setup_tc(dev, TC_SETUP_CBS, &cbs);
239+
err = ops->ndo_setup_tc(dev, TC_SETUP_QDISC_CBS, &cbs);
240240
if (err < 0)
241241
return err;
242242

0 commit comments

Comments
 (0)