aboutsummaryrefslogtreecommitdiff
path: root/net/sched/sch_api.c
Commit message (Collapse)AuthorAgeFilesLines
* pkt_sched: move the sanity test in qdisc_list_add()Eric Dumazet2016-09-181-3/+4
| | | | | | | | | | | | The WARN_ON(root == &noop_qdisc)) added in qdisc_list_add() can trigger in normal conditions when devices are not up. It should be done only right before the list_add_tail() call. Fixes: e57a784d8cae4 ("pkt_sched: set root qdisc before change() in attach_default_qdiscs()") Reported-by: Valdis Kletnieks <Valdis.Kletnieks@vt.edu> Tested-by: Mirco Tischler <mt-ml@gmx.de> Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* pkt_sched: set root qdisc before change() in attach_default_qdiscs()Eric Dumazet2016-09-181-1/+4
| | | | | | | | | | | | | | | | | After commit 95dc19299f74 ("pkt_sched: give visibility to mq slave qdiscs") we call disc_list_add() while the device qdisc might be the noop_qdisc one. This shows up as duplicates in "tc qdisc show", as all inactive devices point to noop_qdisc. Fix this by setting dev->qdisc to the new qdisc before calling ops->change() in attach_default_qdiscs() Add a WARN_ON_ONCE() to catch any future similar problem. Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* 3.10.80 -> 3.10.81Jan Engelmohr2016-08-261-4/+6
|
* first commitMeizu OpenSource2016-08-151-0/+1872