android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
[ Upstream commit 2d5f6a8d7aef7852a9ecc555f88c673a1c91754f ]

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>
Stable-dep-of: 84ad0af0bccd ("net/sched: qdisc_destroy() old ingress and clsact Qdiscs before grafting")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Peilin Ye 2023-06-10 20:30:15 -07:00 committed by Greg Kroah-Hartman
parent b1b42fff8a
commit 9ced730490
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
net/sched/sch_api.c
View File

@ -1044,12 +1044,12 @@ static int qdisc_graft(struct net_device *dev, struct Qdisc *parent,
if (parent == NULL) { if (parent == NULL) {
unsigned int i, num_q, ingress; unsigned int i, num_q, ingress;
struct netdev_queue *dev_queue;
ingress = 0; ingress = 0;
num_q = dev->num_tx_queues; num_q = dev->num_tx_queues;
if ((q && q->flags & TCQ_F_INGRESS) || if ((q && q->flags & TCQ_F_INGRESS) ||
(new && new->flags & TCQ_F_INGRESS)) { (new && new->flags & TCQ_F_INGRESS)) {
num_q = 1;
ingress = 1; ingress = 1;
if (!dev_ingress_queue(dev)) { if (!dev_ingress_queue(dev)) {
NL_SET_ERR_MSG(extack, "Device does not have an ingress queue"); NL_SET_ERR_MSG(extack, "Device does not have an ingress queue");
@ -1065,18 +1065,18 @@ static int qdisc_graft(struct net_device *dev, struct Qdisc *parent,
if (new && new->ops->attach) if (new && new->ops->attach)
goto skip; goto skip;
for (i = 0; i < num_q; i++) { if (!ingress) {
struct netdev_queue *dev_queue = dev_ingress_queue(dev); for (i = 0; i < num_q; i++) {
if (!ingress)
dev_queue = netdev_get_tx_queue(dev, 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)
if (new && i > 0) qdisc_refcount_inc(new);
qdisc_refcount_inc(new);
if (!ingress)
qdisc_put(old); qdisc_put(old);
}
} else {
dev_queue = dev_ingress_queue(dev);
old = dev_graft_qdisc(dev_queue, new);
} }
skip: skip: