Skip to content

Commit

Permalink
net/sched: Refactor qdisc_graft() for ingress and clsact Qdiscs
Browse files Browse the repository at this point in the history
Grafting ingress and clsact Qdiscs does not need a for-loop in
qdisc_graft().  Refactor it.  No functional changes intended.

Tested-by: Pedro Tammela <pctammela@mojatatu.com>
Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
Reviewed-by: Jamal Hadi Salim <jhs@mojatatu.com>
Reviewed-by: Vlad Buslov <vladbu@nvidia.com>
Signed-off-by: Peilin Ye <peilin.ye@bytedance.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
  • Loading branch information
Peilin Ye authored and Paolo Abeni committed Jun 14, 2023
1 parent 41f2c7c commit 2d5f6a8
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions net/sched/sch_api.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand All @@ -1100,18 +1100,18 @@ static int qdisc_graft(struct net_device *dev, struct Qdisc *parent,
if (new && new->ops->attach && !ingress)
goto skip;

for (i = 0; i < num_q; i++) {
struct netdev_queue *dev_queue = dev_ingress_queue(dev);

if (!ingress)
if (!ingress) {
for (i = 0; i < num_q; i++) {
dev_queue = netdev_get_tx_queue(dev, i);
old = dev_graft_qdisc(dev_queue, new);

old = dev_graft_qdisc(dev_queue, new);
if (new && i > 0)
qdisc_refcount_inc(new);

if (!ingress)
if (new && i > 0)
qdisc_refcount_inc(new);
qdisc_put(old);
}
} else {
dev_queue = dev_ingress_queue(dev);
old = dev_graft_qdisc(dev_queue, new);
}

skip:
Expand Down

0 comments on commit 2d5f6a8

Please sign in to comment.