Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8521db4c authored by Nogah Frankel's avatar Nogah Frankel Committed by David S. Miller
Browse files

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: default avatarNogah Frankel <nogahf@mellanox.com>
Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Reviewed-by: default avatarSimon Horman <simon.horman@netronome.com>
Acked-by: default avatarVinicius Costa Gomes <vinicius.gomes@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 575ed7d3

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

+1 −1
Original line number Diff line number Diff line
@@ -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:

include/linux/netdevice.h

+1 −1
Original line number Diff line number Diff line
@@ -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,

};

net/sched/sch_cbs.c

+2 −2
Original line number Diff line number Diff line
@@ -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;