Commit ce8a75f6 authored by Jesus Sanchez-Palencia's avatar Jesus Sanchez-Palencia Committed by Jeff Kirsher

net/sched: Change behavior of mq select_queue()

Currently, the class_ops select_queue() implementation on sch_mq
returns a pointer to netdev_queue #0 when it receives and invalid
qdisc id. That can be misleading since all of mq's inner qdiscs are
attached to a valid netdev_queue.

Here we fix that by returning NULL when a qdisc id is invalid. This is
aligned with how select_queue() is implemented for sch_mqprio in the
next patch on this series, keeping a consistent behavior between these
two qdiscs.
Signed-off-by: default avatarJesus Sanchez-Palencia <jesus.sanchez-palencia@intel.com>
Tested-by: default avatarHenrik Austad <henrik@austad.us>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 26aa0459
...@@ -130,15 +130,7 @@ static struct netdev_queue *mq_queue_get(struct Qdisc *sch, unsigned long cl) ...@@ -130,15 +130,7 @@ static struct netdev_queue *mq_queue_get(struct Qdisc *sch, unsigned long cl)
static struct netdev_queue *mq_select_queue(struct Qdisc *sch, static struct netdev_queue *mq_select_queue(struct Qdisc *sch,
struct tcmsg *tcm) struct tcmsg *tcm)
{ {
unsigned int ntx = TC_H_MIN(tcm->tcm_parent); return mq_queue_get(sch, TC_H_MIN(tcm->tcm_parent));
struct netdev_queue *dev_queue = mq_queue_get(sch, ntx);
if (!dev_queue) {
struct net_device *dev = qdisc_dev(sch);
return netdev_get_tx_queue(dev, 0);
}
return dev_queue;
} }
static int mq_graft(struct Qdisc *sch, unsigned long cl, struct Qdisc *new, static int mq_graft(struct Qdisc *sch, unsigned long cl, struct Qdisc *new,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment