diff options
| -rw-r--r-- | net/sched/sch_api.c | 5 | ||||
| -rw-r--r-- | net/sched/sch_generic.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c index e87b27c7b..4df817499 100644 --- a/net/sched/sch_api.c +++ b/net/sched/sch_api.c @@ -221,8 +221,11 @@ static struct Qdisc *qdisc_match_from_root(struct Qdisc *root, u32 handle) static void qdisc_list_add(struct Qdisc *q) { + struct Qdisc *root = qdisc_dev(q)->qdisc; + + WARN_ON_ONCE(root == &noop_qdisc); if ((q->parent != TC_H_ROOT) && !(q->flags & TCQ_F_INGRESS)) - list_add_tail(&q->list, &qdisc_dev(q)->qdisc->list); + list_add_tail(&q->list, &root->list); } void qdisc_list_del(struct Qdisc *q) diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c index 1cdc95839..60676080c 100644 --- a/net/sched/sch_generic.c +++ b/net/sched/sch_generic.c @@ -747,8 +747,8 @@ static void attach_default_qdiscs(struct net_device *dev) } else { qdisc = qdisc_create_dflt(txq, &mq_qdisc_ops, TC_H_ROOT); if (qdisc) { - qdisc->ops->attach(qdisc); dev->qdisc = qdisc; + qdisc->ops->attach(qdisc); } } } |