Commit 2d5f6a8d authored by Peilin Ye's avatar Peilin Ye Committed by Paolo Abeni
Browse files

net/sched: Refactor qdisc_graft() for ingress and clsact Qdiscs 



Grafting ingress and clsact Qdiscs does not need a for-loop in
qdisc_graft().  Refactor it.  No functional changes intended.

Tested-by: default avatarPedro Tammela <pctammela@mojatatu.com>
Acked-by: default avatarJamal Hadi Salim <jhs@mojatatu.com>
Reviewed-by: default avatarJamal Hadi Salim <jhs@mojatatu.com>
Reviewed-by: default avatarVlad Buslov <vladbu@nvidia.com>
Signed-off-by: default avatarPeilin Ye <peilin.ye@bytedance.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 41f2c7c3

net/sched/sch_api.c

+10 −10
Original line number Diff line number Diff line
@@ -1079,12 +1079,12 @@ static int qdisc_graft(struct net_device *dev, struct Qdisc *parent, 


	if (parent == NULL) {

		unsigned int i, num_q, ingress;

		struct netdev_queue *dev_queue;



		ingress = 0;

		num_q = dev->num_tx_queues;

		if ((q && q->flags & TCQ_F_INGRESS) ||

		    (new && new->flags & TCQ_F_INGRESS)) {

			num_q = 1;

			ingress = 1;

			if (!dev_ingress_queue(dev)) {

				NL_SET_ERR_MSG(extack, "Device does not have an ingress queue");
@@ -1100,19 +1100,19 @@ static int qdisc_graft(struct net_device *dev, struct Qdisc *parent, 
		if (new && new->ops->attach && !ingress)

			goto skip;



		if (!ingress) {

			for (i = 0; i < num_q; i++) {

			struct netdev_queue *dev_queue = dev_ingress_queue(dev);



			if (!ingress)

				dev_queue = netdev_get_tx_queue(dev, i);



				old = dev_graft_qdisc(dev_queue, new);



				if (new && i > 0)

					qdisc_refcount_inc(new);



			if (!ingress)

				qdisc_put(old);

			}

		} else {

			dev_queue = dev_ingress_queue(dev);

			old = dev_graft_qdisc(dev_queue, new);

		}



skip:

		if (!ingress) {