diff --git a/[refs] b/[refs] index 2a683bbdc745..99cef3bc9d34 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 11d46123bfea068a48483f00518d301f452647fb +refs/heads/master: ee7af8264dafa0c8c76a8dc596803966c2e29ebc diff --git a/trunk/net/sched/sch_api.c b/trunk/net/sched/sch_api.c index 4840aff47256..83b23b55ce36 100644 --- a/trunk/net/sched/sch_api.c +++ b/trunk/net/sched/sch_api.c @@ -792,7 +792,7 @@ qdisc_create(struct net_device *dev, struct netdev_queue *dev_queue, goto err_out3; } } - if (parent && !(sch->flags & TCQ_F_INGRESS)) + if ((parent != TC_H_ROOT) && !(sch->flags & TCQ_F_INGRESS)) list_add_tail(&sch->list, &dev_queue->qdisc->list); return sch;