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

Commit 81504d19 authored by Yunsheng Lin's avatar Yunsheng Lin Committed by Greg Kroah-Hartman
Browse files

net: sch_generic: fix the missing new qdisc assignment bug 

When commit 2fb541c862c9 ("net: sch_generic: aviod concurrent reset and
enqueue op for lockless qdisc") is backported to stable kernel, one
assignment is missing, which causes two problems reported by Joakim and
Vishwanath, see [1] and [2].

So add the assignment back to fix it.

1. https://www.spinics.net/lists/netdev/msg693916.html
2. https://www.spinics.net/lists/netdev/msg695131.html



Fixes: 749cc0b0 ("net: sch_generic: aviod concurrent reset and enqueue op for lockless qdisc")
Signed-off-by: default avatarYunsheng Lin <linyunsheng@huawei.com>
Acked-by: default avatarJakub Kicinski <kuba@kernel.org>
Tested-by: default avatarBrian Norris <briannorris@chromium.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2e021b71

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);

	}

}