]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
pkt_sched: set root qdisc before change() in attach_default_qdiscs()
authorEric Dumazet <edumazet@google.com>
Thu, 12 Dec 2013 23:41:56 +0000 (15:41 -0800)
committerDavid S. Miller <davem@davemloft.net>
Sat, 14 Dec 2013 06:20:06 +0000 (01:20 -0500)
commite57a784d8cae429f5b697fe55abf420181d9ff09
tree69c247ac88bc588611f280bf684ae0a707523c63
parent59bcaed5f71f002d39d151ccd387dd0f226e00f2
pkt_sched: set root qdisc before change() in attach_default_qdiscs()

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>
net/sched/sch_api.c
net/sched/sch_generic.c