Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f958326a authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

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

parents 510abd85 a3f0f495

net/sched/sch_generic.c

+3 −0
Original line number Diff line number Diff line
@@ -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);

	}

}