Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

net: sch_generic: fix the missing new qdisc assignment

Browse source 
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 .

Change-Id: I2e3400f64daa703d44680dedfbd367b152620334
Fixes: 749cc0b0c7 ("net: sch_generic: aviod concurrent reset and enqueue op for lockless qdisc")
Signed-off-by: Yunsheng Lin <linyunsheng@huawei.com>
Acked-by: Jakub Kicinski <kuba@kernel.org>
Tested-by: Brian Norris <briannorris@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Git-Commit: 81504d1952d712c8bb9c3966896efee8a37ea966
Git-repo: https://android.googlesource.com/kernel/common/
Signed-off-by: Chinmay Agarwal <chinagar@codeaurora.org>
This commit is contained in:
Yunsheng Lin 2020-11-03 11:25:38 +08:00 committed by Chinmay Agarwal
parent 7ff28e584c
commit a3f0f49564
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
net/sched/sch_generic.c
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);
}
}