Merge "net: sch_generic: fix the missing new qdisc assignment"

This commit is contained in:
qctecmdr 2021-01-07 22:34:03 -08:00 committed by Gerrit - the friendly Code Review server
commit f958326a33

View file

@ -1116,10 +1116,13 @@ static void dev_deactivate_queue(struct net_device *dev,
void *_qdisc_default)
{
struct Qdisc *qdisc = rtnl_dereference(dev_queue->qdisc);
struct Qdisc *qdisc_default = _qdisc_default;
if (qdisc) {
if (!(qdisc->flags & TCQ_F_BUILTIN))
set_bit(__QDISC_STATE_DEACTIVATED, &qdisc->state);
rcu_assign_pointer(dev_queue->qdisc, qdisc_default);
}
}